Use fixed size for builtin menus on non-android platforms

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

diff --git a/src/nodedef.h b/src/nodedef.h
index 27d67b481198748086a9457e415a9910a773ccb9..7280bb8ea727af0e052f2b7569530cb3fee0db61 100644 (file)
--- a/src/nodedef.h
+++ b/src/nodedef.h
@@ -164,7 +164,7 @@ struct ContentFeatures
        */
 #ifndef SERVER
        // 0     1     2     3     4     5
-       // up    down  right left  back  front 
+       // up    down  right left  back  front
        TileSpec tiles[6];
        // Special tiles
        // - Currently used for flowing liquids
@@ -191,7 +191,7 @@ struct ContentFeatures
        std::string mesh;
 #ifndef SERVER
        scene::IMesh *mesh_ptr[24];
-#endif 
+#endif
        float visual_scale; // Misc. scale parameter
        TileDef tiledef[6];
        TileDef tiledef_special[CF_SPECIAL_COUNT]; // eg. flowing liquid
@@ -234,8 +234,6 @@ struct ContentFeatures
        u8 liquid_viscosity;
        // Is liquid renewable (new liquid source will be created between 2 existing)
        bool liquid_renewable;
-       // Ice for water, water for ice
-       std::string freezemelt;
        // Number of flowing liquids surrounding source
        u8 liquid_range;
        u8 drowning;
@@ -261,7 +259,7 @@ struct ContentFeatures
        /*
                Methods
        */
-       
+
        ContentFeatures();
        ~ContentFeatures();
        void reset();
@@ -282,6 +280,40 @@ struct ContentFeatures
        }
 };
 
+class NodeResolver;
+class INodeDefManager;
+
+struct NodeListInfo {
+       NodeListInfo(u32 len)
+       {
+               length       = len;
+               all_required = false;
+               c_fallback   = CONTENT_IGNORE;
+       }
+
+       NodeListInfo(u32 len, content_t fallback)
+       {
+               length       = len;
+               all_required = true;
+               c_fallback   = fallback;
+       }
+
+       u32 length;
+       bool all_required;
+       content_t c_fallback;
+};
+
+struct NodeResolveInfo {
+       NodeResolveInfo(NodeResolver *nr)
+       {
+               resolver = nr;
+       }
+
+       std::list<std::string> nodenames;
+       std::list<NodeListInfo> nodelistinfo;
+       NodeResolver *resolver;
+};
+
 class INodeDefManager
 {
 public:
@@ -296,8 +328,20 @@ public:
        virtual void getIds(const std::string &name, std::set<content_t> &result)
                        const=0;
        virtual const ContentFeatures& get(const std::string &name) const=0;
-       
+
        virtual void serialize(std::ostream &os, u16 protocol_version)=0;
+
+       virtual bool getNodeRegistrationStatus() const=0;
+       virtual void setNodeRegistrationStatus(bool completed)=0;
+
+       virtual void pendNodeResolve(NodeResolveInfo *nri)=0;
+       virtual void cancelNodeResolve(NodeResolver *resolver)=0;
+       virtual void runNodeResolverCallbacks()=0;
+
+       virtual bool getIdFromResolveInfo(NodeResolveInfo *nri,
+               const std::string &node_alt, content_t c_fallback, content_t &result)=0;
+       virtual bool getIdsFromResolveInfo(NodeResolveInfo *nri,
+               std::vector<content_t> &result)=0;
 };
 
 class IWritableNodeDefManager : public INodeDefManager
@@ -338,9 +382,42 @@ public:
 
        virtual void serialize(std::ostream &os, u16 protocol_version)=0;
        virtual void deSerialize(std::istream &is)=0;
+
+       virtual bool getNodeRegistrationStatus() const=0;
+       virtual void setNodeRegistrationStatus(bool completed)=0;
+
+       virtual void pendNodeResolve(NodeResolveInfo *nri)=0;
+       virtual void cancelNodeResolve(NodeResolver *resolver)=0;
+       virtual void runNodeResolverCallbacks()=0;
+
+       virtual bool getIdFromResolveInfo(NodeResolveInfo *nri,
+               const std::string &node_alt, content_t c_fallback, content_t &result)=0;
+       virtual bool getIdsFromResolveInfo(NodeResolveInfo *nri,
+               std::vector<content_t> &result)=0;
+};
+
+IWritableNodeDefManager *createNodeDefManager();
+
+class NodeResolver {
+public:
+       NodeResolver()
+       {
+               m_lookup_done = false;
+               m_ndef = NULL;
+       }
+
+       virtual ~NodeResolver()
+       {
+               if (!m_lookup_done && m_ndef)
+                       m_ndef->cancelNodeResolve(this);
+       }
+
+       virtual void resolveNodeNames(NodeResolveInfo *nri) = 0;
+
+       bool m_lookup_done;
+       INodeDefManager *m_ndef;
 };
 
-IWritableNodeDefManager* createNodeDefManager();
 
 #endif