X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Finventorymanager.cpp;h=ad567f44cdfee3af8babf2adf8e021b28a85b406;hb=3face01a202040e4feff3b0936b4aa89c051c98d;hp=469e7396bf049a7c53cd5e310c0f4b49709a11e0;hpb=98e36d7d681abc508aa81b6f9df0c8c87c7cfe17;p=oweals%2Fminetest.git diff --git a/src/inventorymanager.cpp b/src/inventorymanager.cpp index 469e7396b..ad567f44c 100644 --- a/src/inventorymanager.cpp +++ b/src/inventorymanager.cpp @@ -18,9 +18,10 @@ with this program; if not, write to the Free Software Foundation, Inc., */ #include "inventorymanager.h" +#include "debug.h" #include "log.h" #include "serverenvironment.h" -#include "scripting_game.h" +#include "scripting_server.h" #include "serverobject.h" #include "settings.h" #include "craftdef.h" @@ -43,7 +44,7 @@ std::string InventoryLocation::dump() const void InventoryLocation::serialize(std::ostream &os) const { - switch(type){ + switch (type) { case InventoryLocation::UNDEFINED: os<<"undefined"; break; @@ -68,21 +69,14 @@ void InventoryLocation::deSerialize(std::istream &is) { std::string tname; std::getline(is, tname, ':'); - if(tname == "undefined") - { + if (tname == "undefined") { type = InventoryLocation::UNDEFINED; - } - else if(tname == "current_player") - { + } else if (tname == "current_player") { type = InventoryLocation::CURRENT_PLAYER; - } - else if(tname == "player") - { + } else if (tname == "player") { type = InventoryLocation::PLAYER; std::getline(is, name, '\n'); - } - else if(tname == "nodemeta") - { + } else if (tname == "nodemeta") { type = InventoryLocation::NODEMETA; std::string pos; std::getline(is, pos, '\n'); @@ -90,14 +84,10 @@ void InventoryLocation::deSerialize(std::istream &is) p.X = stoi(fn.next(",")); p.Y = stoi(fn.next(",")); p.Z = stoi(fn.next(",")); - } - else if(tname == "detached") - { + } else if (tname == "detached") { type = InventoryLocation::DETACHED; std::getline(is, name, '\n'); - } - else - { + } else { infostream<<"Unknown InventoryLocation type=\""<getItem(from_i).count; int src_can_take_count = 0xffff; @@ -274,28 +262,23 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame /* Query detached inventories */ // Move occurs in the same detached inventory - if(from_inv.type == InventoryLocation::DETACHED && + if (from_inv.type == InventoryLocation::DETACHED && to_inv.type == InventoryLocation::DETACHED && - from_inv.name == to_inv.name) - { + from_inv.name == to_inv.name) { src_can_take_count = PLAYER_TO_SA(player)->detached_inventory_AllowMove( from_inv.name, from_list, from_i, to_list, to_i, try_take_count, player); dst_can_put_count = src_can_take_count; - } - else - { + } else { // Destination is detached - if(to_inv.type == InventoryLocation::DETACHED) - { + if (to_inv.type == InventoryLocation::DETACHED) { ItemStack src_item = list_from->getItem(from_i); src_item.count = try_take_count; dst_can_put_count = PLAYER_TO_SA(player)->detached_inventory_AllowPut( to_inv.name, to_list, to_i, src_item, player); } // Source is detached - if(from_inv.type == InventoryLocation::DETACHED) - { + if (from_inv.type == InventoryLocation::DETACHED) { ItemStack src_item = list_from->getItem(from_i); src_item.count = try_take_count; src_can_take_count = PLAYER_TO_SA(player)->detached_inventory_AllowTake( @@ -307,28 +290,23 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame // Both endpoints are nodemeta // Move occurs in the same nodemeta inventory - if(from_inv.type == InventoryLocation::NODEMETA && + if (from_inv.type == InventoryLocation::NODEMETA && to_inv.type == InventoryLocation::NODEMETA && - from_inv.p == to_inv.p) - { + from_inv.p == to_inv.p) { src_can_take_count = PLAYER_TO_SA(player)->nodemeta_inventory_AllowMove( from_inv.p, from_list, from_i, to_list, to_i, try_take_count, player); dst_can_put_count = src_can_take_count; - } - else - { + } else { // Destination is nodemeta - if(to_inv.type == InventoryLocation::NODEMETA) - { + if (to_inv.type == InventoryLocation::NODEMETA) { ItemStack src_item = list_from->getItem(from_i); src_item.count = try_take_count; dst_can_put_count = PLAYER_TO_SA(player)->nodemeta_inventory_AllowPut( to_inv.p, to_list, to_i, src_item, player); } // Source is nodemeta - if(from_inv.type == InventoryLocation::NODEMETA) - { + if (from_inv.type == InventoryLocation::NODEMETA) { ItemStack src_item = list_from->getItem(from_i); src_item.count = try_take_count; src_can_take_count = PLAYER_TO_SA(player)->nodemeta_inventory_AllowTake( @@ -340,17 +318,16 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame /* Modify count according to collected data */ count = try_take_count; - if(src_can_take_count != -1 && count > src_can_take_count) + if (src_can_take_count != -1 && count > src_can_take_count) count = src_can_take_count; - if(dst_can_put_count != -1 && count > dst_can_put_count) + if (dst_can_put_count != -1 && count > dst_can_put_count) count = dst_can_put_count; /* Limit according to source item count */ - if(count > list_from->getItem(from_i).count) + if (count > list_from->getItem(from_i).count) count = list_from->getItem(from_i).count; /* If no items will be moved, don't go further */ - if(count == 0) - { + if (count == 0) { infostream<<"IMoveAction::apply(): move was completely disallowed:" <<" count="<deleteItem(to_i); list_to->addItem(to_i, to_stack_was); list_from->deleteItem(from_i); @@ -426,19 +403,17 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame // If we are inside the move somewhere loop, we don't need to report // anything if nothing happened (perhaps we don't need to report // anything for caused_by_move_somewhere == true, but this way its safer) - if (caused_by_move_somewhere && move_count == 0) { + if (caused_by_move_somewhere && move_count == 0) return; - } /* Record rollback information */ - if(!ignore_rollback && gamedef->rollback()) - { + if (!ignore_rollback && gamedef->rollback()) { IRollbackManager *rollback = gamedef->rollback(); // If source is not infinite, record item take - if(src_can_take_count != -1){ + if (src_can_take_count != -1) { RollbackAction action; std::string loc; { @@ -451,7 +426,7 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame rollback->reportAction(action); } // If destination is not infinite, record item put - if(dst_can_put_count != -1){ + if (dst_can_put_count != -1) { RollbackAction action; std::string loc; { @@ -472,25 +447,20 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame /* Detached inventories */ // Both endpoints are same detached - if(from_inv.type == InventoryLocation::DETACHED && + if (from_inv.type == InventoryLocation::DETACHED && to_inv.type == InventoryLocation::DETACHED && - from_inv.name == to_inv.name) - { + from_inv.name == to_inv.name) { PLAYER_TO_SA(player)->detached_inventory_OnMove( from_inv.name, from_list, from_i, to_list, to_i, count, player); - } - else - { + } else { // Destination is detached - if(to_inv.type == InventoryLocation::DETACHED) - { + if (to_inv.type == InventoryLocation::DETACHED) { PLAYER_TO_SA(player)->detached_inventory_OnPut( to_inv.name, to_list, to_i, src_item, player); } // Source is detached - if(from_inv.type == InventoryLocation::DETACHED) - { + if (from_inv.type == InventoryLocation::DETACHED) { PLAYER_TO_SA(player)->detached_inventory_OnTake( from_inv.name, from_list, from_i, src_item, player); } @@ -499,31 +469,27 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame /* Node metadata inventories */ // Both endpoints are same nodemeta - if(from_inv.type == InventoryLocation::NODEMETA && + if (from_inv.type == InventoryLocation::NODEMETA && to_inv.type == InventoryLocation::NODEMETA && - from_inv.p == to_inv.p) - { + from_inv.p == to_inv.p) { PLAYER_TO_SA(player)->nodemeta_inventory_OnMove( from_inv.p, from_list, from_i, to_list, to_i, count, player); - } - else{ + } else { // Destination is nodemeta - if(to_inv.type == InventoryLocation::NODEMETA) - { + if (to_inv.type == InventoryLocation::NODEMETA) { PLAYER_TO_SA(player)->nodemeta_inventory_OnPut( to_inv.p, to_list, to_i, src_item, player); } // Source is nodemeta - else if(from_inv.type == InventoryLocation::NODEMETA) - { + else if (from_inv.type == InventoryLocation::NODEMETA) { PLAYER_TO_SA(player)->nodemeta_inventory_OnTake( from_inv.p, from_list, from_i, src_item, player); } } mgr->setInventoryModified(from_inv, false); - if(inv_from != inv_to) + if (inv_from != inv_to) mgr->setInventoryModified(to_inv, false); } @@ -534,18 +500,18 @@ void IMoveAction::clientApply(InventoryManager *mgr, IGameDef *gamedef) Inventory *inv_from = mgr->getInventory(from_inv); Inventory *inv_to = mgr->getInventory(to_inv); - if(!inv_from || !inv_to) + if (!inv_from || !inv_to) return; InventoryLocation current_player; current_player.setCurrentPlayer(); Inventory *inv_player = mgr->getInventory(current_player); - if(inv_from != inv_player || inv_to != inv_player) + if (inv_from != inv_player || inv_to != inv_player) return; InventoryList *list_from = inv_from->getList(from_list); InventoryList *list_to = inv_to->getList(to_list); - if(!list_from || !list_to) + if (!list_from || !list_to) return; if (!move_somewhere) @@ -554,7 +520,7 @@ void IMoveAction::clientApply(InventoryManager *mgr, IGameDef *gamedef) list_from->moveItemSomewhere(from_i, list_to, count); mgr->setInventoryModified(from_inv); - if(inv_from != inv_to) + if (inv_from != inv_to) mgr->setInventoryModified(to_inv); } @@ -582,7 +548,7 @@ void IDropAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame { Inventory *inv_from = mgr->getInventory(from_inv); - if(!inv_from){ + if (!inv_from) { infostream<<"IDropAction::apply(): FAIL: source inventory not found: " <<"from_inv=\""<getItem(from_i).empty()) - { + if (list_from->getItem(from_i).empty()) { infostream<<"IDropAction::apply(): FAIL: source item not found: " <<"from_inv=\""<getItem(from_i).count; - if(count != 0 && count < take_count) + if (count != 0 && count < take_count) take_count = count; int src_can_take_count = take_count; // Source is detached - if(from_inv.type == InventoryLocation::DETACHED) - { + if (from_inv.type == InventoryLocation::DETACHED) { ItemStack src_item = list_from->getItem(from_i); src_item.count = take_count; src_can_take_count = PLAYER_TO_SA(player)->detached_inventory_AllowTake( @@ -631,15 +595,14 @@ void IDropAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame } // Source is nodemeta - if(from_inv.type == InventoryLocation::NODEMETA) - { + if (from_inv.type == InventoryLocation::NODEMETA) { ItemStack src_item = list_from->getItem(from_i); src_item.count = take_count; src_can_take_count = PLAYER_TO_SA(player)->nodemeta_inventory_AllowTake( from_inv.p, from_list, from_i, src_item, player); } - if(src_can_take_count != -1 && src_can_take_count < take_count) + if (src_can_take_count != -1 && src_can_take_count < take_count) take_count = src_can_take_count; int actually_dropped_count = 0; @@ -650,21 +613,20 @@ void IDropAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame ItemStack item1 = list_from->getItem(from_i); item1.count = take_count; if(PLAYER_TO_SA(player)->item_OnDrop(item1, player, - player->getBasePosition() + v3f(0,1,0))) - { + player->getBasePosition())) { actually_dropped_count = take_count - item1.count; - if(actually_dropped_count == 0){ + if (actually_dropped_count == 0) { infostream<<"Actually dropped no items"<takeItem(from_i, actually_dropped_count); - if(item2.count != actually_dropped_count) + if (item2.count != actually_dropped_count) errorstream<<"Could not take dropped count of items"<setInventoryModified(from_inv, false); @@ -684,15 +646,13 @@ void IDropAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame */ // Source is detached - if(from_inv.type == InventoryLocation::DETACHED) - { + if (from_inv.type == InventoryLocation::DETACHED) { PLAYER_TO_SA(player)->detached_inventory_OnTake( from_inv.name, from_list, from_i, src_item, player); } // Source is nodemeta - if(from_inv.type == InventoryLocation::NODEMETA) - { + if (from_inv.type == InventoryLocation::NODEMETA) { PLAYER_TO_SA(player)->nodemeta_inventory_OnTake( from_inv.p, from_list, from_i, src_item, player); } @@ -700,12 +660,11 @@ void IDropAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame /* Record rollback information */ - if(!ignore_src_rollback && gamedef->rollback()) - { + if (!ignore_src_rollback && gamedef->rollback()) { IRollbackManager *rollback = gamedef->rollback(); // If source is not infinite, record item take - if(src_can_take_count != -1){ + if (src_can_take_count != -1) { RollbackAction action; std::string loc; { @@ -726,20 +685,20 @@ void IDropAction::clientApply(InventoryManager *mgr, IGameDef *gamedef) // to make lag less apparent. Inventory *inv_from = mgr->getInventory(from_inv); - if(!inv_from) + if (!inv_from) return; InventoryLocation current_player; current_player.setCurrentPlayer(); Inventory *inv_player = mgr->getInventory(current_player); - if(inv_from != inv_player) + if (inv_from != inv_player) return; InventoryList *list_from = inv_from->getList(from_list); - if(!list_from) + if (!list_from) return; - if(count == 0) + if (count == 0) list_from->changeItem(from_i, ItemStack()); else list_from->takeItem(from_i, count); @@ -816,17 +775,15 @@ void ICraftAction::apply(InventoryManager *mgr, // Add the new replacements to the list IItemDefManager *itemdef = gamedef->getItemDefManager(); - for (std::vector::iterator it = temp.begin(); - it != temp.end(); ++it) { - for (std::vector::iterator jt = output_replacements.begin(); - jt != output_replacements.end(); ++jt) { - if (it->name == jt->name) { - *it = jt->addItem(*it, itemdef); - if (it->empty()) + for (auto &itemstack : temp) { + for (auto &output_replacement : output_replacements) { + if (itemstack.name == output_replacement.name) { + itemstack = output_replacement.addItem(itemstack, itemdef); + if (itemstack.empty()) continue; } } - output_replacements.push_back(*it); + output_replacements.push_back(itemstack); } actionstream << player->getDescription() @@ -837,7 +794,8 @@ void ICraftAction::apply(InventoryManager *mgr, // Decrement counter if (count_remaining == 1) break; - else if (count_remaining > 1) + + if (count_remaining > 1) count_remaining--; // Get next crafting result @@ -848,24 +806,23 @@ void ICraftAction::apply(InventoryManager *mgr, // Put the replacements in the inventory or drop them on the floor, if // the invenotry is full - for (std::vector::iterator it = output_replacements.begin(); - it != output_replacements.end(); ++it) { + for (auto &output_replacement : output_replacements) { if (list_main) - *it = list_main->addItem(*it); - if (it->empty()) + output_replacement = list_main->addItem(output_replacement); + if (output_replacement.empty()) continue; - u16 count = it->count; + u16 count = output_replacement.count; do { - PLAYER_TO_SA(player)->item_OnDrop(*it, player, - player->getBasePosition() + v3f(0,1,0)); - if (count >= it->count) { + PLAYER_TO_SA(player)->item_OnDrop(output_replacement, player, + player->getBasePosition()); + if (count >= output_replacement.count) { errorstream << "Couldn't drop replacement stack " << - it->getItemString() << " because drop loop didn't " + output_replacement.getItemString() << " because drop loop didn't " "decrease count." << std::endl; break; } - } while (!it->empty()); + } while (!output_replacement.empty()); } infostream<<"ICraftAction::apply(): crafted " @@ -881,38 +838,34 @@ void ICraftAction::clientApply(InventoryManager *mgr, IGameDef *gamedef) // Crafting helper -bool getCraftingResult(Inventory *inv, ItemStack& result, +bool getCraftingResult(Inventory *inv, ItemStack &result, std::vector &output_replacements, bool decrementInput, IGameDef *gamedef) { - DSTACK(FUNCTION_NAME); - result.clear(); // Get the InventoryList in which we will operate InventoryList *clist = inv->getList("craft"); - if(!clist) + if (!clist) return false; // Mangle crafting grid to an another format CraftInput ci; ci.method = CRAFT_METHOD_NORMAL; ci.width = clist->getWidth() ? clist->getWidth() : 3; - for(u16 i=0; igetSize(); i++) + for (u16 i=0; i < clist->getSize(); i++) ci.items.push_back(clist->getItem(i)); // Find out what is crafted and add it to result item slot CraftOutput co; bool found = gamedef->getCraftDefManager()->getCraftResult( ci, co, output_replacements, decrementInput, gamedef); - if(found) + if (found) result.deSerialize(co.item, gamedef->getItemDefManager()); - if(found && decrementInput) - { + if (found && decrementInput) { // CraftInput has been changed, apply changes in clist - for(u16 i=0; igetSize(); i++) - { + for (u16 i=0; i < clist->getSize(); i++) { clist->changeItem(i, ci.items[i]); } }