(se)SerializeString: Include max length in the name

[minetest.git] / src / content_nodemeta.cpp

diff --git a/src/content_nodemeta.cpp b/src/content_nodemeta.cpp
index a9a8cc60c7846a3bd382c82c51be506afab0af8d..39743c11f73e76f3dac64547d1443a9b5a4d70c6 100644 (file)
--- a/src/content_nodemeta.cpp
+++ b/src/content_nodemeta.cpp
@@ -18,8 +18,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include "content_nodemeta.h"
+#include "nodemetadata.h"
+#include "nodetimer.h"
 #include "inventory.h"
 #include "log.h"
+#include "serialization.h"
 #include "util/serialize.h"
 #include "util/string.h"
 #include "constants.h" // MAP_BLOCKSIZE
@@ -40,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") + "\"");
@@ -76,7 +79,7 @@ static bool content_nodemeta_deserialize_legacy_body(
                        inv->getList("0")->setName("main");
                }
                assert(inv->getList("main") && !inv->getList("0"));
-               
+
                meta->setString("formspec","size[8,9]"
                                "list[current_name;main;0,0;8,4;]"
                                "list[current_player;main;0,5;8,4;]");
@@ -84,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"
@@ -93,7 +96,7 @@ static bool content_nodemeta_deserialize_legacy_body(
                        inv->getList("0")->setName("main");
                }
                assert(inv->getList("main") && !inv->getList("0"));
-               
+
                meta->setString("formspec","size[8,9]"
                                "list[current_name;main;0,0;8,4;]"
                                "list[current_player;main;0,5;8,4;]");
@@ -135,14 +138,14 @@ 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);
 }
 
 void content_nodemeta_deserialize_legacy(std::istream &is,
                NodeMetadataList *meta, NodeTimerList *timers,
-               IGameDef *gamedef)
+               IItemDefManager *item_def_mgr)
 {
        meta->clear();
        timers->clear();
@@ -151,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);
@@ -171,27 +174,18 @@ void content_nodemeta_deserialize_legacy(std::istream &is,
 
                if(meta->get(p) != NULL)
                {
-                       infostream<<"WARNING: "<<__FUNCTION_NAME<<": "
+                       warningstream<<FUNCTION_NAME<<": "
                                        <<"already set data at position"
                                        <<"("<<p.X<<","<<p.Y<<","<<p.Z<<"): Ignoring."
                                        <<std::endl;
                        continue;
                }
 
-               NodeMetadata *data = new NodeMetadata(gamedef);
+               NodeMetadata *data = new NodeMetadata(item_def_mgr);
                bool need_timer = content_nodemeta_deserialize_legacy_meta(is, data);
                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