diff options
| author | Wuzzy <wuzzy2@mail.ru> | 2020-01-22 09:19:27 +0000 |
|---|---|---|
| committer | Loïc Blot <nerzhul@users.noreply.github.com> | 2020-01-22 10:19:27 +0100 |
| commit | e05b7dbb3c89ddaf52a4c493a0d05f1ca2244dce (patch) | |
| tree | 76194e6a7646cffffa9133935a82cd3400466b81 /src/object_properties.cpp | |
| parent | 3dfb6ecbb26516bcbcc1ef88860175e39af71381 (diff) | |
| download | minetest-e05b7dbb3c89ddaf52a4c493a0d05f1ca2244dce.tar.gz minetest-e05b7dbb3c89ddaf52a4c493a0d05f1ca2244dce.tar.bz2 minetest-e05b7dbb3c89ddaf52a4c493a0d05f1ca2244dce.zip | |
Remove unused weight property from objects (#9320)
Diffstat (limited to 'src/object_properties.cpp')
| -rw-r--r-- | src/object_properties.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/object_properties.cpp b/src/object_properties.cpp index a037c5f65..4cf180b18 100644 --- a/src/object_properties.cpp +++ b/src/object_properties.cpp @@ -37,7 +37,6 @@ std::string ObjectProperties::dump() os << ", breath_max=" << breath_max; os << ", physical=" << physical; os << ", collideWithObjects=" << collideWithObjects; - os << ", weight=" << weight; os << ", collisionbox=" << PP(collisionbox.MinEdge) << "," << PP(collisionbox.MaxEdge); os << ", visual=" << visual; os << ", mesh=" << mesh; @@ -77,7 +76,7 @@ void ObjectProperties::serialize(std::ostream &os) const writeU8(os, 4); // PROTOCOL_VERSION >= 37 writeU16(os, hp_max); writeU8(os, physical); - writeF32(os, weight); + writeF32(os, 0.f); // Removed property (weight) writeV3F32(os, collisionbox.MinEdge); writeV3F32(os, collisionbox.MaxEdge); writeV3F32(os, selectionbox.MinEdge); @@ -128,7 +127,7 @@ void ObjectProperties::deSerialize(std::istream &is) hp_max = readU16(is); physical = readU8(is); - weight = readF32(is); + readU32(is); // removed property (weight) collisionbox.MinEdge = readV3F32(is); collisionbox.MaxEdge = readV3F32(is); selectionbox.MinEdge = readV3F32(is); |