Use fixed size for builtin menus on non-android platforms

[oweals/minetest.git] / src / inventory.h

diff --git a/src/inventory.h b/src/inventory.h
index d21a5dedab29cf09e2abcdb5280aa416bfad1fc0..e4a97e1d37353f79f98b7eb5481be60c93cd49ca 100644 (file)
--- 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;