diff options
| author | ShadowNinja <shadowninja@minetest.net> | 2014-06-25 20:28:41 -0400 |
|---|---|---|
| committer | ShadowNinja <shadowninja@minetest.net> | 2014-11-19 16:21:59 -0500 |
| commit | b1965ac20922e3722392114bd63a22b403dcbe98 (patch) | |
| tree | ab7ba20d23e01be920d7161fbfd20d2e265f2b70 /src/inventory.h | |
| parent | da0f1e5497c7dece9ff5092adfb5881b0dd2e10c (diff) | |
| download | minetest-b1965ac20922e3722392114bd63a22b403dcbe98.tar.gz minetest-b1965ac20922e3722392114bd63a22b403dcbe98.tar.bz2 minetest-b1965ac20922e3722392114bd63a22b403dcbe98.zip | |
Clean up rollback
Diffstat (limited to 'src/inventory.h')
| -rw-r--r-- | src/inventory.h | 14 |
1 files changed, 8 insertions, 6 deletions
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 <iostream> -#include <string> -#include <vector> -#include "irrlichttypes.h" #include "debug.h" #include "itemdef.h" +#include "irrlichttypes.h" +#include <istream> +#include <ostream> +#include <string> +#include <vector> 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; |