minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Don't lookup node texts in a endless recursion loop

This commit is contained in:
sapier 2014-01-07 11:15:24 +01:00
parent 0fd5c61c00
commit 6f661f77a6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/nodemetadata.h
View File

@ -55,7 +55,7 @@ public:
i = m_stringvars.find(name); i = m_stringvars.find(name);
if(i == m_stringvars.end()) if(i == m_stringvars.end())
return ""; return "";
return resolveString(i->second); return i->second;
} }
void setString(const std::string &name, const std::string &var) void setString(const std::string &name, const std::string &var)
{ {
@ -68,7 +68,7 @@ public:
std::string resolveString(const std::string &str) const std::string resolveString(const std::string &str) const
{ {
if(str.substr(0,2) == "${" && str[str.length()-1] == '}') if(str.substr(0,2) == "${" && str[str.length()-1] == '}')
return resolveString(getString(str.substr(2,str.length()-3))); return getString(str.substr(2,str.length()-3));
return str; return str;
} }
std::map<std::string, std::string> getStrings() const std::map<std::string, std::string> getStrings() const