Replace occurences of serializeString

diff --git a/src/itemdef.cpp b/src/itemdef.cpp
index 9a8ef89c8b7abdad79fddd30bc79b63379c2dd41..84ad96c7fc128d7e510c2927e4397bf88449e888 100644 (file)
--- a/src/itemdef.cpp
+++ b/src/itemdef.cpp
@@ -166,7 +166,7 @@ void ItemDefinition::serialize(std::ostream &os, u16 protocol_version) const
        writeARGB8(os, color);
        os << serializeString16(inventory_overlay);
        os << serializeString16(wield_overlay);
-       os << serializeString(wield_animation);
+       os << serializeString16(wield_animation);
 
        os << serializeString16(short_description);
 }
@@ -222,7 +222,7 @@ void ItemDefinition::deSerialize(std::istream &is)
        // block to not need to increase the version.
        try {
                short_description = deSerializeString16(is);
-               wield_animation = deSerializeString(is);
+               wield_animation = deSerializeString16(is);
        } catch (SerializationError &e) {
        }
 }

diff --git a/src/wieldanimation.cpp b/src/wieldanimation.cpp
index 022588455837b87275731e692c44aab70c7d8fe0..f1ff51a7593b3765022b1744863b3d7163a5128b 100644 (file)
--- a/src/wieldanimation.cpp
+++ b/src/wieldanimation.cpp
@@ -145,7 +145,7 @@ void WieldAnimation::fillRepository()
 
 void WieldAnimation::serialize(std::ostream &os, u16 protocol_version)
 {
-       os << serializeString(name);
+       os << serializeString16(name);
        writeF32(os, m_duration);
        std::vector<v3f> nodes = m_translationspline.getNodes();
        writeU16(os, nodes.size());
@@ -176,7 +176,7 @@ void WieldAnimation::serialize(std::ostream &os, u16 protocol_version)
 
 WieldAnimation WieldAnimation::deSerialize(std::istream &is)
 {
-       std::string name = deSerializeString(is);
+       std::string name = deSerializeString16(is);
        WieldAnimation &anim = repository[name];
        anim.name = name;
        m_duration = readF32(is);