aboutsummaryrefslogtreecommitdiff
path: root/src/itemdef.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/itemdef.cpp')
-rw-r--r--src/itemdef.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/itemdef.cpp b/src/itemdef.cpp
index 5fb1e4c47..9a8ef89c8 100644
--- a/src/itemdef.cpp
+++ b/src/itemdef.cpp
@@ -67,6 +67,7 @@ ItemDefinition& ItemDefinition::operator=(const ItemDefinition &def)
inventory_overlay = def.inventory_overlay;
wield_image = def.wield_image;
wield_overlay = def.wield_overlay;
+ wield_animation = def.wield_animation;
wield_scale = def.wield_scale;
stack_max = def.stack_max;
usable = def.usable;
@@ -108,6 +109,7 @@ void ItemDefinition::reset()
inventory_overlay = "";
wield_image = "";
wield_overlay = "";
+ wield_animation = "";
palette_image = "";
color = video::SColor(0xFFFFFFFF);
wield_scale = v3f(1.0, 1.0, 1.0);
@@ -164,6 +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(short_description);
}
@@ -219,7 +222,9 @@ void ItemDefinition::deSerialize(std::istream &is)
// block to not need to increase the version.
try {
short_description = deSerializeString16(is);
- } catch(SerializationError &e) {};
+ wield_animation = deSerializeString(is);
+ } catch (SerializationError &e) {
+ }
}