X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fcontent_nodemeta.cpp;h=39743c11f73e76f3dac64547d1443a9b5a4d70c6;hb=074e6a67def42ab9c91b8638c914869d516a9cd7;hp=7f4264d8e6e284bd8d21ffc37ed2c3777c45026b;hpb=6f2d785d0ff761961912d7e79a7d16c4adf86861;p=dragonfireclient.git

diff --git a/src/content_nodemeta.cpp b/src/content_nodemeta.cpp
index 7f4264d8e..39743c11f 100644
--- a/src/content_nodemeta.cpp
+++ b/src/content_nodemeta.cpp
@@ -43,26 +43,26 @@ static bool content_nodemeta_deserialize_legacy_body(
 	if(id == NODEMETA_GENERIC) // GenericNodeMetadata (0.4-dev)
 	{
 		meta->getInventory()->deSerialize(is);
-		deSerializeLongString(is);  // m_text
-		deSerializeString(is);  // m_owner
+		deSerializeString32(is);  // m_text
+		deSerializeString16(is);  // m_owner
 
-		meta->setString("infotext",deSerializeString(is));
-		meta->setString("formspec",deSerializeString(is));
+		meta->setString("infotext",deSerializeString16(is));
+		meta->setString("formspec",deSerializeString16(is));
 		readU8(is);  // m_allow_text_input
 		readU8(is);  // m_allow_removal
 		readU8(is);  // m_enforce_owner
 
 		int num_vars = readU32(is);
 		for(int i=0; i<num_vars; i++){
-			std::string name = deSerializeString(is);
-			std::string var = deSerializeLongString(is);
+			std::string name = deSerializeString16(is);
+			std::string var = deSerializeString32(is);
 			meta->setString(name, var);
 		}
 		return false;
 	}
 	else if(id == NODEMETA_SIGN) // SignNodeMetadata
 	{
-		meta->setString("text", deSerializeString(is));
+		meta->setString("text", deSerializeString16(is));
 		//meta->setString("infotext","\"${text}\"");
 		meta->setString("infotext",
 				std::string("\"") + meta->getString("text") + "\"");
@@ -87,7 +87,7 @@ static bool content_nodemeta_deserialize_legacy_body(
 	}
 	else if(id == NODEMETA_LOCKABLE_CHEST) // LockingChestNodeMetadata
 	{
-		meta->setString("owner", deSerializeString(is));
+		meta->setString("owner", deSerializeString16(is));
 		meta->getInventory()->deSerialize(is);
 
 		// Rename inventory list "0" to "main"
@@ -138,7 +138,7 @@ static bool content_nodemeta_deserialize_legacy_meta(
 	s16 id = readS16(is);
 
 	// Read data
-	std::string data = deSerializeString(is);
+	std::string data = deSerializeString16(is);
 	std::istringstream tmp_is(data, std::ios::binary);
 	return content_nodemeta_deserialize_legacy_body(tmp_is, id, meta);
 }
@@ -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