Rename --do-unittests to --run-unittests as @Zeno- and @sfan5 requested

[minetest.git] / src / nodedef.h

diff --git a/src/nodedef.h b/src/nodedef.h
index 1be764121be2fe75ea6e2e671d895ba5bd605553..7280bb8ea727af0e052f2b7569530cb3fee0db61 100644 (file)
--- a/src/nodedef.h
+++ b/src/nodedef.h
@@ -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;
@@ -333,6 +331,9 @@ class INodeDefManager
 
        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;
@@ -382,6 +383,9 @@ class IWritableNodeDefManager : public INodeDefManager
        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;
@@ -402,9 +406,9 @@ class NodeResolver {
                m_ndef = NULL;
        }
 
-       ~NodeResolver()
+       virtual ~NodeResolver()
        {
-               if (!m_lookup_done)
+               if (!m_lookup_done && m_ndef)
                        m_ndef->cancelNodeResolve(this);
        }