X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fnodemetadata.h;h=5af10d0f0ef8133a9fad5d177c1026fcdb6060cf;hb=0e07a7157f4865c26b4d7d0ba6fb12f1de59373c;hp=e855eab9b4c3fa6a6d94beb0086548aabcfc90ec;hpb=c4315a7afafcc9adff945b5e63800340f6c2c008;p=dragonfireclient.git

diff --git a/src/nodemetadata.h b/src/nodemetadata.h
index e855eab9b..5af10d0f0 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,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef NODEMETADATA_HEADER
 #define NODEMETADATA_HEADER
 
-#include "irrlichttypes.h"
+#include "irrlichttypes_bloated.h"
 #include <string>
 #include <iostream>
 #include <map>
@@ -55,7 +55,7 @@ class NodeMetadata
 		i = m_stringvars.find(name);
 		if(i == m_stringvars.end())
 			return "";
-		return i->second;
+		return resolveString(i->second);
 	}
 	void setString(const std::string &name, const std::string &var)
 	{
@@ -64,6 +64,17 @@ class NodeMetadata
 		else
 			m_stringvars[name] = var;
 	}
+	// support variable names in values
+	std::string resolveString(const std::string &str) const
+	{
+		if(str.substr(0,2) == "${" && str[str.length()-1] == '}')
+			return resolveString(getString(str.substr(2,str.length()-3)));
+		return str;
+	}
+	std::map<std::string, std::string> getStrings() const
+	{
+		return m_stringvars;
+	}
 
 	// The inventory
 	Inventory* getInventory()