diff options
author | sfan5 <sfan5@live.de> | 2021-03-09 00:56:53 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-09 00:56:53 +0100 |
commit | bf8fb2672e53f6a3eff15184328b881446a183dd (patch) | |
tree | f8668369f7bf251c9ceb28cc51731ddb66434c28 /src/itemdef.cpp | |
parent | a21402b38faab484195224205ef0bbd112f72162 (diff) | |
download | minetest-bf8fb2672e53f6a3eff15184328b881446a183dd.tar.gz minetest-bf8fb2672e53f6a3eff15184328b881446a183dd.tar.bz2 minetest-bf8fb2672e53f6a3eff15184328b881446a183dd.zip |
Use place_param2 client-side for item appearance & prediction (#11024)
Diffstat (limited to 'src/itemdef.cpp')
-rw-r--r-- | src/itemdef.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/itemdef.cpp b/src/itemdef.cpp index 5fb1e4c47..d79d6b263 100644 --- a/src/itemdef.cpp +++ b/src/itemdef.cpp @@ -71,13 +71,11 @@ ItemDefinition& ItemDefinition::operator=(const ItemDefinition &def) stack_max = def.stack_max; usable = def.usable; liquids_pointable = def.liquids_pointable; - if(def.tool_capabilities) - { - tool_capabilities = new ToolCapabilities( - *def.tool_capabilities); - } + if (def.tool_capabilities) + tool_capabilities = new ToolCapabilities(*def.tool_capabilities); groups = def.groups; node_placement_prediction = def.node_placement_prediction; + place_param2 = def.place_param2; sound_place = def.sound_place; sound_place_failed = def.sound_place_failed; range = def.range; @@ -120,8 +118,8 @@ void ItemDefinition::reset() sound_place = SimpleSoundSpec(); sound_place_failed = SimpleSoundSpec(); range = -1; - node_placement_prediction = ""; + place_param2 = 0; } void ItemDefinition::serialize(std::ostream &os, u16 protocol_version) const @@ -166,6 +164,8 @@ void ItemDefinition::serialize(std::ostream &os, u16 protocol_version) const os << serializeString16(wield_overlay); os << serializeString16(short_description); + + os << place_param2; } void ItemDefinition::deSerialize(std::istream &is) @@ -219,6 +219,8 @@ void ItemDefinition::deSerialize(std::istream &is) // block to not need to increase the version. try { short_description = deSerializeString16(is); + + place_param2 = readU8(is); // 0 if missing } catch(SerializationError &e) {}; } |