aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/itemdef.cpp4
-rw-r--r--src/wieldanimation.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/itemdef.cpp b/src/itemdef.cpp
index 9a8ef89c8..84ad96c7f 100644
--- 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 022588455..f1ff51a75 100644
--- 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);