Fix a crash (assert) when client set serial version < 24 in INIT

[minetest.git] / src / inventorymanager.cpp

diff --git a/src/inventorymanager.cpp b/src/inventorymanager.cpp
index 1ffcc3460a1c77cba33a41666a02bcacd9e12ebd..ed18126d0dc8538fcb9e0349f15229662ffd090d 100644 (file)
--- a/src/inventorymanager.cpp
+++ b/src/inventorymanager.cpp
@@ -368,7 +368,7 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
        */
        if(!ignore_rollback && gamedef->rollback())
        {
-               IRollbackReportSink *rollback = gamedef->rollback();
+               IRollbackManager *rollback = gamedef->rollback();
 
                // If source is not infinite, record item take
                if(src_can_take_count != -1){
@@ -380,7 +380,7 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
                                loc = os.str();
                        }
                        action.setModifyInventoryStack(loc, from_list, from_i, false,
-                                       src_item.getItemString());
+                                       src_item);
                        rollback->reportAction(action);
                }
                // If destination is not infinite, record item put
@@ -393,7 +393,7 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
                                loc = os.str();
                        }
                        action.setModifyInventoryStack(loc, to_list, to_i, true,
-                                       src_item.getItemString());
+                                       src_item);
                        rollback->reportAction(action);
                }
        }
@@ -632,7 +632,7 @@ void IDropAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
        */
        if(!ignore_src_rollback && gamedef->rollback())
        {
-               IRollbackReportSink *rollback = gamedef->rollback();
+               IRollbackManager *rollback = gamedef->rollback();
 
                // If source is not infinite, record item take
                if(src_can_take_count != -1){
@@ -644,7 +644,7 @@ void IDropAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
                                loc = os.str();
                        }
                        action.setModifyInventoryStack(loc, from_list, from_i,
-                                       false, src_item.getItemString());
+                                       false, src_item);
                        rollback->reportAction(action);
                }
        }
@@ -727,9 +727,9 @@ void ICraftAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGam
        ItemStack crafted;
        ItemStack craftresultitem;
        int count_remaining = count;
-       bool found = getCraftingResult(inv_craft, crafted, false, gamedef);
+       getCraftingResult(inv_craft, crafted, false, gamedef);
        PLAYER_TO_SA(player)->item_CraftPredict(crafted, player, list_craft, craft_inv);
-       found = !crafted.empty();
+       bool found = !crafted.empty();
 
        while(found && list_craftresult->itemFits(0, crafted))
        {