diff options
| author | sapier <Sapier at GMX dot net> | 2014-01-07 11:15:24 +0100 |
|---|---|---|
| committer | sapier <Sapier at GMX dot net> | 2014-01-07 11:15:24 +0100 |
| commit | 6f661f77a697a9ab3c8488214844f728f1e61daa (patch) | |
| tree | 8fd378954b6382637bd00e314bd925c83d975f32 | |
| parent | 0fd5c61c00819ae3eaf298739e8cf879e2d43820 (diff) | |
| download | minetest-6f661f77a697a9ab3c8488214844f728f1e61daa.tar.gz minetest-6f661f77a697a9ab3c8488214844f728f1e61daa.tar.bz2 minetest-6f661f77a697a9ab3c8488214844f728f1e61daa.zip | |
Don't lookup node texts in a endless recursion loop
| -rw-r--r-- | src/nodemetadata.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nodemetadata.h b/src/nodemetadata.h index ce2c9e6d9..710270502 100644 --- a/src/nodemetadata.h +++ b/src/nodemetadata.h @@ -55,7 +55,7 @@ public: i = m_stringvars.find(name); if(i == m_stringvars.end()) return ""; - return resolveString(i->second); + return i->second; } void setString(const std::string &name, const std::string &var) { @@ -68,7 +68,7 @@ public: 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 getString(str.substr(2,str.length()-3)); return str; } std::map<std::string, std::string> getStrings() const |