* fix automerge regression

[dragonfireclient.git] / src / nodemetadata.h

diff --git a/src/nodemetadata.h b/src/nodemetadata.h
index 21916677ee370e01d61bfc6ee50b3ec6ac8e45f7..de682f9b61561374a92ef80769e33f47ab335295 100644 (file)
--- a/src/nodemetadata.h
+++ b/src/nodemetadata.h
@@ -37,6 +37,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                - Text
 */
 
+class Inventory;
+
 class NodeMetadata
 {
 public:
@@ -52,7 +54,17 @@ class NodeMetadata
        virtual u16 typeId() const = 0;
        virtual NodeMetadata* clone() = 0;
        virtual void serializeBody(std::ostream &os) = 0;
-       virtual std::string infoText() { return "<todo: remove this text>"; }
+       virtual std::string infoText() {return "";}
+       virtual Inventory* getInventory() {return NULL;}
+       // This is called always after the inventory is modified, before
+       // the changes are copied elsewhere
+       virtual void inventoryModified(){}
+       // A step in time. Returns true if metadata changed.
+       virtual bool step(float dtime) {return false;}
+       virtual bool nodeRemovalDisabled(){return false;}
+       // Used to make custom inventory menus.
+       // See format in guiInventoryMenu.cpp.
+       virtual std::string getInventoryDrawSpecString(){return "";}
 
 protected:
        static void registerType(u16 id, Factory f);
@@ -60,38 +72,9 @@ class NodeMetadata
        static core::map<u16, Factory> m_types;
 };
 
-class SignNodeMetadata : public NodeMetadata
-{
-public:
-       SignNodeMetadata(std::string text);
-       //~SignNodeMetadata();
-       
-       virtual u16 typeId() const;
-       static NodeMetadata* create(std::istream &is);
-       virtual NodeMetadata* clone();
-       virtual void serializeBody(std::ostream &os);
-       virtual std::string infoText();
-
-       std::string getText(){ return m_text; }
-       void setText(std::string t){ m_text = t; }
-
-private:
-       std::string m_text;
-};
-
-class ChestNodeMetadata : public NodeMetadata
-{
-public:
-       ChestNodeMetadata();
-       
-       virtual u16 typeId() const;
-       static NodeMetadata* create(std::istream &is);
-       virtual NodeMetadata* clone();
-       virtual void serializeBody(std::ostream &os);
-       virtual std::string infoText();
-
-private:
-};
+/*
+       List of metadata of all the nodes of a block
+*/
 
 class NodeMetadataList
 {
@@ -107,6 +90,10 @@ class NodeMetadataList
        void remove(v3s16 p);
        // Deletes old data and sets a new one
        void set(v3s16 p, NodeMetadata *d);
+       
+       // A step in time. Returns true if something changed.
+       bool step(float dtime);
+
 private:
        core::map<v3s16, NodeMetadata*> m_data;
 };