X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fnodemetadata.h;h=6baf3b3d37bf3808bedab05e768c6472ccaaed13;hb=55c646c5c2b40931d24be8541b3056ab3322a70f;hp=37668268e21038892eb9fc6499a6a8a0444a2838;hpb=18bb0ea1ead82406bcfb89ea14908a4d0063209e;p=oweals%2Fminetest.git

diff --git a/src/nodemetadata.h b/src/nodemetadata.h
index 37668268e..6baf3b3d3 100644
--- a/src/nodemetadata.h
+++ b/src/nodemetadata.h
@@ -1,18 +1,18 @@
 /*
-Minetest-c55
-Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
@@ -20,9 +20,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef NODEMETADATA_HEADER
 #define NODEMETADATA_HEADER
 
-#include "irrlichttypes.h"
+#include "irr_v3d.h"
 #include <string>
 #include <iostream>
+#include <map>
 
 /*
 	NodeMetadata stores arbitary amounts of data for special blocks.
@@ -39,46 +40,36 @@ class IGameDef;
 class NodeMetadata
 {
 public:
-	typedef NodeMetadata* (*Factory)(std::istream&, IGameDef *gamedef);
-	typedef NodeMetadata* (*Factory2)(IGameDef *gamedef);
-
 	NodeMetadata(IGameDef *gamedef);
-	virtual ~NodeMetadata();
+	~NodeMetadata();
 	
-	static NodeMetadata* create(const std::string &name, IGameDef *gamedef);
-	static NodeMetadata* deSerialize(std::istream &is, IGameDef *gamedef);
-	void serialize(std::ostream &os);
+	void serialize(std::ostream &os) const;
+	void deSerialize(std::istream &is);
 	
-	virtual u16 typeId() const = 0;
-	virtual const char* typeName() const = 0;
-	virtual NodeMetadata* clone(IGameDef *gamedef) = 0;
-	virtual void serializeBody(std::ostream &os) = 0;
-	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 "";}
-	// primarily used for locking chests, but others can play too
-	virtual std::string getOwner(){ return std::string(""); }
-	virtual void setOwner(std::string t){}
-	virtual bool allowsTextInput(){ return false; }
-	virtual std::string getText(){ return ""; }
-	virtual void setText(const std::string &t){}
-protected:
-	static void registerType(u16 id, const std::string &name, Factory f,
-			Factory2 f2);
-	IGameDef *m_gamedef;
+	void clear();
+
+	// Generic key/value store
+	std::string getString(const std::string &name, unsigned short recursion = 0) const;
+	void setString(const std::string &name, const std::string &var);
+	// Support variable names in values
+	std::string resolveString(const std::string &str, unsigned short recursion = 0) const;
+	std::map<std::string, std::string> getStrings() const
+	{
+		return m_stringvars;
+	}
+
+	// The inventory
+	Inventory* getInventory()
+	{
+		return m_inventory;
+	}
+
 private:
-	static core::map<u16, Factory> m_types;
-	static core::map<std::string, Factory2> m_names;
+	std::map<std::string, std::string> m_stringvars;
+	Inventory *m_inventory;
 };
 
+
 /*
 	List of metadata of all the nodes of a block
 */
@@ -88,7 +79,7 @@ class NodeMetadataList
 public:
 	~NodeMetadataList();
 
-	void serialize(std::ostream &os);
+	void serialize(std::ostream &os) const;
 	void deSerialize(std::istream &is, IGameDef *gamedef);
 	
 	// Get pointer to data
@@ -97,12 +88,11 @@ public:
 	void remove(v3s16 p);
 	// Deletes old data and sets a new one
 	void set(v3s16 p, NodeMetadata *d);
+	// Deletes all
+	void clear();
 	
-	// A step in time. Returns true if something changed.
-	bool step(float dtime);
-
 private:
-	core::map<v3s16, NodeMetadata*> m_data;
+	std::map<v3s16, NodeMetadata*> m_data;
 };
 
 #endif