From b1965ac20922e3722392114bd63a22b403dcbe98 Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Wed, 25 Jun 2014 20:28:41 -0400 Subject: Clean up rollback --- src/inventory.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/inventory.h') diff --git a/src/inventory.h b/src/inventory.h index d21a5deda..e4a97e1d3 100644 --- a/src/inventory.h +++ b/src/inventory.h @@ -20,12 +20,13 @@ with this program; if not, write to the Free Software Foundation, Inc., #ifndef INVENTORY_HEADER #define INVENTORY_HEADER -#include -#include -#include -#include "irrlichttypes.h" #include "debug.h" #include "itemdef.h" +#include "irrlichttypes.h" +#include +#include +#include +#include struct ToolCapabilities; @@ -39,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; -- cgit v1.2.3