diff options
| author | Elias Fleckenstein <eliasfleckenstein@web.de> | 2021-03-02 13:13:30 +0100 |
|---|---|---|
| committer | Elias Fleckenstein <eliasfleckenstein@web.de> | 2021-03-05 09:45:58 +0100 |
| commit | 30b4a623812c38eccfb12fea97677bcbadf7ad66 (patch) | |
| tree | 1ee70e3765896673c16ca8b2fd09cc0b04ae7a4d | |
| parent | 6b9057a1f2c0f3fabbf061f5bd49519920dd783b (diff) | |
| download | minetest-30b4a623812c38eccfb12fea97677bcbadf7ad66.tar.xz | |
Replace occurences of serializeString
| -rw-r--r-- | src/itemdef.cpp | 4 | ||||
| -rw-r--r-- | src/wieldanimation.cpp | 4 |
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); |