X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fcontent_nodemeta.cpp;h=fc2859d27ac0d891a8134c4a04f56925d7094a91;hb=0c08f948d7014e66d5a79d7584c03164af2edd93;hp=072800d6c9c0302597d8fcf1c3e38b7b9e6165ea;hpb=96cc5b34fe0151d2a1498eaaafb205757db346c4;p=dragonfireclient.git

diff --git a/src/content_nodemeta.cpp b/src/content_nodemeta.cpp
index 072800d6c..fc2859d27 100644
--- a/src/content_nodemeta.cpp
+++ b/src/content_nodemeta.cpp
@@ -154,9 +154,9 @@ void content_nodemeta_deserialize_legacy(std::istream &is,
 
 	if(version > 1)
 	{
-		infostream<<__FUNCTION_NAME<<": version "<<version<<" not supported"
+		infostream<<FUNCTION_NAME<<": version "<<version<<" not supported"
 				<<std::endl;
-		throw SerializationError(__FUNCTION_NAME);
+		throw SerializationError(FUNCTION_NAME);
 	}
 
 	u16 count = readU16(is);
@@ -174,7 +174,7 @@ void content_nodemeta_deserialize_legacy(std::istream &is,
 
 		if(meta->get(p) != NULL)
 		{
-			warningstream<<__FUNCTION_NAME<<": "
+			warningstream<<FUNCTION_NAME<<": "
 					<<"already set data at position"
 					<<"("<<p.X<<","<<p.Y<<","<<p.Z<<"): Ignoring."
 					<<std::endl;
@@ -186,15 +186,6 @@ void content_nodemeta_deserialize_legacy(std::istream &is,
 		meta->set(p, data);
 
 		if(need_timer)
-			timers->set(p, NodeTimer(1., 0.));
+			timers->set(NodeTimer(1., 0., p));
 	}
 }
-
-void content_nodemeta_serialize_legacy(std::ostream &os, NodeMetadataList *meta)
-{
-	// Sorry, I was too lazy to implement this. --kahrl
-	writeU16(os, 1); // version
-	writeU16(os, 0); // count
-}
-
-// END