Add disable_jump and fall_damage_add_percent node groups

[dragonfireclient.git] / src / inventorymanager.cpp

diff --git a/src/inventorymanager.cpp b/src/inventorymanager.cpp
index 7fc8c8ce4539c3f288ae565be993421ea9d24d0d..e2e5378383f8d4a0956256d9aa061ec6db086dd1 100644 (file)
--- a/src/inventorymanager.cpp
+++ b/src/inventorymanager.cpp
@@ -360,7 +360,7 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
                IRollbackReportSink *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;
                        {
@@ -373,7 +373,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;
                        {
@@ -575,6 +575,7 @@ void IDropAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
 
        // Drop the item
        ItemStack item1 = list_from->getItem(from_i);
+       item1.count = take_count;
        if(scriptapi_item_on_drop(player->getEnv()->getLua(), item1, player,
                                player->getBasePosition() + v3f(0,1,0)))
        {
@@ -633,7 +634,7 @@ void IDropAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
                IRollbackReportSink *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;
                        {
@@ -768,18 +769,16 @@ bool getCraftingResult(Inventory *inv, ItemStack& result,
        
        result.clear();
 
-       // TODO: Allow different sizes of crafting grids
-
        // Get the InventoryList in which we will operate
        InventoryList *clist = inv->getList("craft");
-       if(!clist || clist->getSize() != 9)
+       if(!clist)
                return false;
 
        // Mangle crafting grid to an another format
        CraftInput ci;
        ci.method = CRAFT_METHOD_NORMAL;
-       ci.width = 3;
-       for(u16 i=0; i<9; i++)
+       ci.width = clist->getWidth() ? clist->getWidth() : 3;
+       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
@@ -792,7 +791,7 @@ bool getCraftingResult(Inventory *inv, ItemStack& result,
        if(found && decrementInput)
        {
                // CraftInput has been changed, apply changes in clist
-               for(u16 i=0; i<9; i++)
+               for(u16 i=0; i<clist->getSize(); i++)
                {
                        clist->changeItem(i, ci.items[i]);
                }