Fix build since: "Remove referenced schematics from Decorations on clear"

[dragonfireclient.git] / src / inventorymanager.cpp

diff --git a/src/inventorymanager.cpp b/src/inventorymanager.cpp
index ed18126d0dc8538fcb9e0349f15229662ffd090d..c3a9576f90ef2111998d3f9c8665c74e6d67778f 100644 (file)
--- a/src/inventorymanager.cpp
+++ b/src/inventorymanager.cpp
@@ -22,7 +22,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "environment.h"
 #include "scripting_game.h"
 #include "serverobject.h"
-#include "main.h"  // for g_settings
 #include "settings.h"
 #include "craftdef.h"
 #include "rollback_interface.h"
@@ -62,7 +61,7 @@ void InventoryLocation::serialize(std::ostream &os) const
                os<<"detached:"<<name;
                break;
        default:
-               assert(0);
+               FATAL_ERROR("Unhandled inventory location type");
        }
 }
 
@@ -455,9 +454,9 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
                }
        }
        
-       mgr->setInventoryModified(from_inv);
+       mgr->setInventoryModified(from_inv, false);
        if(inv_from != inv_to)
-               mgr->setInventoryModified(to_inv);
+               mgr->setInventoryModified(to_inv, false);
 }
 
 void IMoveAction::clientApply(InventoryManager *mgr, IGameDef *gamedef)
@@ -597,7 +596,7 @@ void IDropAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
                        if(item2.count != actually_dropped_count)
                                errorstream<<"Could not take dropped count of items"<<std::endl;
 
-                       mgr->setInventoryModified(from_inv);
+                       mgr->setInventoryModified(from_inv, false);
                }
        }