Continue with 0.4.13-dev

[oweals/minetest.git] / src / inventorymanager.h

diff --git a/src/inventorymanager.h b/src/inventorymanager.h
index 8e2abc9614f13f339efac2fa4b5e96c6b0ef3f7d..35fcf4b99dbf6f40d4b08cc975521360ba2f45a2 100644 (file)
--- a/src/inventorymanager.h
+++ b/src/inventorymanager.h
@@ -108,11 +108,11 @@ class InventoryManager
 public:
        InventoryManager(){}
        virtual ~InventoryManager(){}
-       
+
        // Get an inventory (server and client)
        virtual Inventory* getInventory(const InventoryLocation &loc){return NULL;}
     // Set modified (will be saved and sent over network; only on server)
-       virtual void setInventoryModified(const InventoryLocation &loc){}
+       virtual void setInventoryModified(const InventoryLocation &loc, bool playerSend = true){}
     // Send inventory action to server (only on client)
        virtual void inventoryAction(InventoryAction *a){}
 };
@@ -124,7 +124,7 @@ public:
 struct InventoryAction
 {
        static InventoryAction * deSerialize(std::istream &is);
-       
+
        virtual u16 getType() const = 0;
        virtual void serialize(std::ostream &os) const = 0;
        virtual void apply(InventoryManager *mgr, ServerActiveObject *player,
@@ -143,15 +143,24 @@ struct IMoveAction : public InventoryAction
        InventoryLocation to_inv;
        std::string to_list;
        s16 to_i;
-       
+       bool move_somewhere;
+
+       // treat these as private
+       // related to movement to somewhere
+       bool caused_by_move_somewhere;
+       u32 move_count;
+
        IMoveAction()
        {
                count = 0;
                from_i = -1;
                to_i = -1;
+               move_somewhere = false;
+               caused_by_move_somewhere = false;
+               move_count = 0;
        }
-       
-       IMoveAction(std::istream &is);
+
+       IMoveAction(std::istream &is, bool somewhere);
 
        u16 getType() const
        {
@@ -160,14 +169,18 @@ struct IMoveAction : public InventoryAction
 
        void serialize(std::ostream &os) const
        {
-               os<<"Move ";
-               os<<count<<" ";
-               os<<from_inv.dump()<<" ";
-               os<<from_list<<" ";
-               os<<from_i<<" ";
-               os<<to_inv.dump()<<" ";
-               os<<to_list<<" ";
-               os<<to_i;
+               if (!move_somewhere)
+                       os << "Move ";
+               else
+                       os << "MoveSomewhere ";
+               os << count << " ";
+               os << from_inv.dump() << " ";
+               os << from_list << " ";
+               os << from_i << " ";
+               os << to_inv.dump() << " ";
+               os << to_list;
+               if (!move_somewhere)
+                       os << " " << to_i;
        }
 
        void apply(InventoryManager *mgr, ServerActiveObject *player, IGameDef *gamedef);
@@ -182,13 +195,13 @@ struct IDropAction : public InventoryAction
        InventoryLocation from_inv;
        std::string from_list;
        s16 from_i;
-       
+
        IDropAction()
        {
                count = 0;
                from_i = -1;
        }
-       
+
        IDropAction(std::istream &is);
 
        u16 getType() const
@@ -215,12 +228,12 @@ struct ICraftAction : public InventoryAction
        // count=0 means "everything"
        u16 count;
        InventoryLocation craft_inv;
-       
+
        ICraftAction()
        {
                count = 0;
        }
-       
+
        ICraftAction(std::istream &is);
 
        u16 getType() const
@@ -242,6 +255,7 @@ struct ICraftAction : public InventoryAction
 
 // Crafting helper
 bool getCraftingResult(Inventory *inv, ItemStack& result,
+               std::vector<ItemStack> &output_replacements,
                bool decrementInput, IGameDef *gamedef);
 
 #endif