Fix a memleak pointed by @Zeno- in MeshUpdateQueue

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

diff --git a/src/inventorymanager.h b/src/inventorymanager.h
index 009db48367ef82f4db07c348553b30566b5e716a..35fcf4b99dbf6f40d4b08cc975521360ba2f45a2 100644 (file)
--- a/src/inventorymanager.h
+++ b/src/inventorymanager.h
@@ -1,6 +1,6 @@
 /*
-Minetest-c55
-Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -32,9 +32,10 @@ struct InventoryLocation
                CURRENT_PLAYER,
                PLAYER,
                NODEMETA,
+        DETACHED,
        } type;
 
-       std::string name; // PLAYER
+       std::string name; // PLAYER, DETACHED
        v3s16 p; // NODEMETA
 
        InventoryLocation()
@@ -59,6 +60,34 @@ struct InventoryLocation
                type = NODEMETA;
                p = p_;
        }
+       void setDetached(const std::string &name_)
+       {
+               type = DETACHED;
+               name = name_;
+       }
+
+       bool operator==(const InventoryLocation &other) const
+       {
+               if(type != other.type)
+                       return false;
+               switch(type){
+               case UNDEFINED:
+                       return false;
+               case CURRENT_PLAYER:
+                       return true;
+               case PLAYER:
+                       return (name == other.name);
+               case NODEMETA:
+                       return (p == other.p);
+               case DETACHED:
+                       return (name == other.name);
+               }
+               return false;
+       }
+       bool operator!=(const InventoryLocation &other) const
+       {
+               return !(*this == other);
+       }
 
        void applyCurrentPlayer(const std::string &name_)
        {
@@ -79,14 +108,12 @@ class InventoryManager
 public:
        InventoryManager(){}
        virtual ~InventoryManager(){}
-       
-       // Get an inventory or set it modified (so it will be updated over
-       // network or so)
-       virtual Inventory* getInventory(const InventoryLocation &loc){return NULL;}
-       virtual std::string getInventoryOwner(const InventoryLocation &loc){return "";}
-       virtual void setInventoryModified(const InventoryLocation &loc){}
 
-       // Used on the client to send an action to the server
+       // 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, bool playerSend = true){}
+    // Send inventory action to server (only on client)
        virtual void inventoryAction(InventoryAction *a){}
 };
 
@@ -97,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,
@@ -116,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
        {
@@ -133,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);
@@ -155,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
@@ -188,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
@@ -215,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