Fix MSVC build

[dragonfireclient.git] / src / inventory.h

diff --git a/src/inventory.h b/src/inventory.h
index 411eabb0977c4939351d1e7ceb03331b3d1c67f5..e4a97e1d37353f79f98b7eb5481be60c93cd49ca 100644 (file)
--- a/src/inventory.h
+++ b/src/inventory.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.
 */
@@ -20,13 +20,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef INVENTORY_HEADER
 #define INVENTORY_HEADER
 
-#include <iostream>
-#include <sstream>
-#include <string>
-#include <vector>
-#include "common_irrlicht.h"
 #include "debug.h"
 #include "itemdef.h"
+#include "irrlichttypes.h"
+#include <istream>
+#include <ostream>
+#include <string>
+#include <vector>
 
 struct ToolCapabilities;
 
@@ -40,8 +40,9 @@ struct ItemStack
 
        // Serialization
        void serialize(std::ostream &os) const;
-       void deSerialize(std::istream &is, IItemDefManager *itemdef);
-       void deSerialize(const std::string &s, IItemDefManager *itemdef);
+       // Deserialization.  Pass itemdef unless you don't want aliases resolved.
+       void deSerialize(std::istream &is, IItemDefManager *itemdef = NULL);
+       void deSerialize(const std::string &s, IItemDefManager *itemdef = NULL);
 
        // Returns the string used for inventory
        std::string getItemString() const;
@@ -176,14 +177,22 @@ class InventoryList
        ~InventoryList();
        void clearItems();
        void setSize(u32 newsize);
+       void setWidth(u32 newWidth);
+       void setName(const std::string &name);
        void serialize(std::ostream &os) const;
        void deSerialize(std::istream &is);
 
        InventoryList(const InventoryList &other);
        InventoryList & operator = (const InventoryList &other);
+       bool operator == (const InventoryList &other) const;
+       bool operator != (const InventoryList &other) const
+       {
+               return !(*this == other);
+       }
 
        const std::string &getName() const;
        u32 getSize() const;
+       u32 getWidth() const;
        // Count used slots
        u32 getUsedSlots() const;
        u32 getFreeSlots() const;
@@ -239,7 +248,7 @@ class InventoryList
 
 private:
        std::vector<ItemStack> m_items;
-       u32 m_size;
+       u32 m_size, m_width;
        std::string m_name;
        IItemDefManager *m_itemdef;
 };
@@ -255,7 +264,12 @@ class Inventory
        Inventory(IItemDefManager *itemdef);
        Inventory(const Inventory &other);
        Inventory & operator = (const Inventory &other);
-       
+       bool operator == (const Inventory &other) const;
+       bool operator != (const Inventory &other) const
+       {
+               return !(*this == other);
+       }
+
        void serialize(std::ostream &os) const;
        void deSerialize(std::istream &is);
 
@@ -267,18 +281,30 @@ class Inventory
        // A shorthand for adding items. Returns leftover item (possibly empty).
        ItemStack addItem(const std::string &listname, const ItemStack &newitem)
        {
+               m_dirty = true;
                InventoryList *list = getList(listname);
                if(list == NULL)
                        return newitem;
                return list->addItem(newitem);
        }
-       
+
+       bool checkModified() const
+       {
+               return m_dirty;
+       }
+
+       void setModified(const bool x)
+       {
+               m_dirty = x;
+       }
+
 private:
        // -1 if not found
        const s32 getListIndex(const std::string &name) const;
 
        std::vector<InventoryList*> m_lists;
        IItemDefManager *m_itemdef;
+       bool m_dirty;
 };
 
 #endif