Add NodeResolver and clean up node name -> content ID resolution system

[minetest.git] / src / inventory.h

diff --git a/src/inventory.h b/src/inventory.h
index 48ee20e83bccb8d85db973406b3aa071405c1112..d21a5dedab29cf09e2abcdb5280aa416bfad1fc0 100644 (file)
--- a/src/inventory.h
+++ b/src/inventory.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
@@ -21,10 +21,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define INVENTORY_HEADER
 
 #include <iostream>
-#include <sstream>
 #include <string>
 #include <vector>
-#include "common_irrlicht.h"
+#include "irrlichttypes.h"
 #include "debug.h"
 #include "itemdef.h"
 
@@ -176,15 +175,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;
@@ -240,7 +246,7 @@ class InventoryList
 
 private:
        std::vector<ItemStack> m_items;
-       u32 m_size;
+       u32 m_size, m_width;
        std::string m_name;
        IItemDefManager *m_itemdef;
 };
@@ -256,7 +262,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);
 
@@ -268,18 +279,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