X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fnodemetadata.h;h=5af10d0f0ef8133a9fad5d177c1026fcdb6060cf;hb=bc3072b35e6a60cc77ee5275eb9e7cd5c537385c;hp=de74e14eeb7375f3be49d17ca6455fa54a057e88;hpb=037b2591971d752e67fa7d47095b996b3f56da5a;p=minetest.git

diff --git a/src/nodemetadata.h b/src/nodemetadata.h
index de74e14ee..5af10d0f0 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.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,13 @@ 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;