X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fnodemetadata.h;h=6baf3b3d37bf3808bedab05e768c6472ccaaed13;hb=29b413b376d42c27bf1f7065c9f7c850b61f3f24;hp=24779a1ea8aaa5cdf11449c7ed54f4293747b952;hpb=9f031a67594162a53b07acbfbc65faf8c4938e99;p=dragonfireclient.git

diff --git a/src/nodemetadata.h b/src/nodemetadata.h
index 24779a1ea..6baf3b3d3 100644
--- a/src/nodemetadata.h
+++ b/src/nodemetadata.h
@@ -1,6 +1,6 @@
 /*
-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 Lesser General Public License as published by
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef NODEMETADATA_HEADER
 #define NODEMETADATA_HEADER
 
-#include "irrlichttypes_bloated.h"
+#include "irr_v3d.h"
 #include <string>
 #include <iostream>
 #include <map>
@@ -49,21 +49,10 @@ class NodeMetadata
 	void clear();
 
 	// Generic key/value store
-	std::string getString(const std::string &name) const
-	{
-		std::map<std::string, std::string>::const_iterator i;
-		i = m_stringvars.find(name);
-		if(i == m_stringvars.end())
-			return "";
-		return i->second;
-	}
-	void setString(const std::string &name, const std::string &var)
-	{
-		if(var.empty())
-			m_stringvars.erase(name);
-		else
-			m_stringvars[name] = var;
-	}
+	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;