X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Finventory.h;h=52b776db34684bd4a9dff6e7178e0eec959b446d;hb=fa427d641b687dd8585adced708510b94588cf51;hp=ffe944a137c250af1512f0fe88f84ac208de3189;hpb=497ff1ecd64c8908f988e15ca879824f2781e3fd;p=oweals%2Fminetest.git diff --git a/src/inventory.h b/src/inventory.h index ffe944a13..52b776db3 100644 --- a/src/inventory.h +++ b/src/inventory.h @@ -1,6 +1,6 @@ /* Minetest -Copyright (C) 2010-2011 celeron55, Perttu Ahola +Copyright (C) 2010-2013 celeron55, Perttu Ahola 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 -#include #include #include -#include "irrlichttypes_bloated.h" +#include "irrlichttypes.h" #include "debug.h" #include "itemdef.h" @@ -183,6 +182,11 @@ public: 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; @@ -258,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);