Add core.request_insecure_environment()

[dragonfireclient.git] / src / inventorymanager.h

diff --git a/src/inventorymanager.h b/src/inventorymanager.h
index 890d05168dd259d53c69859c79b82426a35c7931..39cc6e50f3b07423c48fc88c72efb70cace43ce0 100644 (file)
--- a/src/inventorymanager.h
+++ b/src/inventorymanager.h
@@ -1,18 +1,18 @@
 /*
-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 General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
@@ -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_)
        {
@@ -80,13 +109,11 @@ class InventoryManager
        InventoryManager(){}
        virtual ~InventoryManager(){}
        
-       // Get an inventory or set it modified (so it will be updated over
-       // network or so)
+       // Get an inventory (server and client)
        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
+    // 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){}
 };
 
@@ -102,6 +129,8 @@ struct InventoryAction
        virtual void serialize(std::ostream &os) const = 0;
        virtual void apply(InventoryManager *mgr, ServerActiveObject *player,
                        IGameDef *gamedef) = 0;
+       virtual void clientApply(InventoryManager *mgr, IGameDef *gamedef) = 0;
+       virtual ~InventoryAction() {};
 };
 
 struct IMoveAction : public InventoryAction
@@ -142,6 +171,8 @@ struct IMoveAction : public InventoryAction
        }
 
        void apply(InventoryManager *mgr, ServerActiveObject *player, IGameDef *gamedef);
+
+       void clientApply(InventoryManager *mgr, IGameDef *gamedef);
 };
 
 struct IDropAction : public InventoryAction
@@ -175,6 +206,8 @@ struct IDropAction : public InventoryAction
        }
 
        void apply(InventoryManager *mgr, ServerActiveObject *player, IGameDef *gamedef);
+
+       void clientApply(InventoryManager *mgr, IGameDef *gamedef);
 };
 
 struct ICraftAction : public InventoryAction
@@ -203,6 +236,8 @@ struct ICraftAction : public InventoryAction
        }
 
        void apply(InventoryManager *mgr, ServerActiveObject *player, IGameDef *gamedef);
+
+       void clientApply(InventoryManager *mgr, IGameDef *gamedef);
 };
 
 // Crafting helper