X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Finventory.h;h=52b776db34684bd4a9dff6e7178e0eec959b446d;hb=fa427d641b687dd8585adced708510b94588cf51;hp=48ee20e83bccb8d85db973406b3aa071405c1112;hpb=037b2591971d752e67fa7d47095b996b3f56da5a;p=oweals%2Fminetest.git

diff --git a/src/inventory.h b/src/inventory.h
index 48ee20e83..52b776db3 100644
--- 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 @@ public:
 	~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 @@ public:
 
 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 @@ public:
 	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);