X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fnodemetadata.cpp;h=1e40a1630ea7c03c5c152546174cb0c42d31897c;hb=718bcafd5174690a7731f9b04873e9a09f7a47b7;hp=141c779f14e176b40b8774c1e487c6abbdfde15c;hpb=d0ea6f9920d30f46d1f5d44e8823a8d932f9f29d;p=minetest.git

diff --git a/src/nodemetadata.cpp b/src/nodemetadata.cpp
index 141c779f1..1e40a1630 100644
--- a/src/nodemetadata.cpp
+++ b/src/nodemetadata.cpp
@@ -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
@@ -83,7 +83,7 @@ void NodeMetadataList::serialize(std::ostream &os) const
 		Version 0 is a placeholder for "nothing to see here; go away."
 	*/
 
-	if(m_data.size() == 0){
+	if(m_data.empty()){
 		writeU8(os, 0); // version
 		return;
 	}
@@ -109,10 +109,10 @@ void NodeMetadataList::serialize(std::ostream &os) const
 
 void NodeMetadataList::deSerialize(std::istream &is, IGameDef *gamedef)
 {
-	m_data.clear();
+	clear();
 
 	u8 version = readU8(is);
-	
+
 	if(version == 0){
 		// Nothing
 		return;
@@ -130,12 +130,12 @@ void NodeMetadataList::deSerialize(std::istream &is, IGameDef *gamedef)
 	{
 		u16 p16 = readU16(is);
 
-		v3s16 p(0,0,0);
-		p.Z += p16 / MAP_BLOCKSIZE / MAP_BLOCKSIZE;
-		p16 -= p.Z * MAP_BLOCKSIZE * MAP_BLOCKSIZE;
-		p.Y += p16 / MAP_BLOCKSIZE;
-		p16 -= p.Y * MAP_BLOCKSIZE;
-		p.X += p16;
+		v3s16 p;
+		p.Z = p16 / MAP_BLOCKSIZE / MAP_BLOCKSIZE;
+		p16 &= MAP_BLOCKSIZE * MAP_BLOCKSIZE - 1;
+		p.Y = p16 / MAP_BLOCKSIZE;
+		p16 &= MAP_BLOCKSIZE - 1;
+		p.X = p16;
 
 		if(m_data.find(p) != m_data.end())
 		{
@@ -191,3 +191,34 @@ void NodeMetadataList::clear()
 	}
 	m_data.clear();
 }
+
+std::string NodeMetadata::getString(const std::string &name, unsigned short recursion) const
+{
+	std::map<std::string, std::string>::const_iterator it;
+	it = m_stringvars.find(name);
+	if (it == m_stringvars.end()) {
+		return "";
+	}
+	return resolveString(it->second, recursion);
+}
+
+void NodeMetadata::setString(const std::string &name, const std::string &var)
+{
+	if (var.empty()) {
+		m_stringvars.erase(name);
+	} else {
+		m_stringvars[name] = var;
+	}
+}
+
+std::string NodeMetadata::resolveString(const std::string &str, unsigned short recursion) const
+{
+	if (recursion > 1) {
+		return str;
+	}
+	if (str.substr(0, 2) == "${" && str[str.length() - 1] == '}') {
+		return getString(str.substr(2, str.length() - 3), recursion + 1);
+	}
+	return str;
+}
+