diff options
| author | Craig Robbins <kde.psych@gmail.com> | 2017-02-10 22:21:23 +1000 |
|---|---|---|
| committer | Craig Robbins <kde.psych@gmail.com> | 2017-02-10 22:21:23 +1000 |
| commit | 7bd3e2bceb45a371f3bc7029dbc7729cb3ce42fb (patch) | |
| tree | b0778db83f641527f25c2db4bef222e89b879162 | |
| parent | f5d4494a51a4f38553c10efd51a5c423cd357c87 (diff) | |
| download | minetest-7bd3e2bceb45a371f3bc7029dbc7729cb3ce42fb.tar.gz minetest-7bd3e2bceb45a371f3bc7029dbc7729cb3ce42fb.tar.bz2 minetest-7bd3e2bceb45a371f3bc7029dbc7729cb3ce42fb.zip | |
Revert "Plantlike visual scale: Send sqrt(visual_scale) to old clients"
This reverts commit cdc538e0a242167cd7031d40670d2d4464b87f2c.
| -rw-r--r-- | src/network/networkprotocol.h | 2 | ||||
| -rw-r--r-- | src/nodedef.cpp | 10 |
2 files changed, 3 insertions, 9 deletions
diff --git a/src/network/networkprotocol.h b/src/network/networkprotocol.h index 5301cc91c..a511d169b 100644 --- a/src/network/networkprotocol.h +++ b/src/network/networkprotocol.h @@ -146,8 +146,6 @@ with this program; if not, write to the Free Software Foundation, Inc., PROTOCOL VERSION 30: New ContentFeatures serialization version Add node and tile color and palette - Fix plantlike visual_scale being applied squared and add compatibility - with pre-30 clients by sending sqrt(visual_scale) */ #define LATEST_PROTOCOL_VERSION 30 diff --git a/src/nodedef.cpp b/src/nodedef.cpp index c717b62b9..0bb150267 100644 --- a/src/nodedef.cpp +++ b/src/nodedef.cpp @@ -1611,10 +1611,6 @@ void ContentFeatures::serializeOld(std::ostream &os, u16 protocol_version) const compatible_param_type_2 = CPT2_WALLMOUNTED; } - float compatible_visual_scale = visual_scale; - if (protocol_version < 30 && drawtype == NDT_PLANTLIKE) - compatible_visual_scale = sqrt(visual_scale); - if (protocol_version == 13) { writeU8(os, 5); // version @@ -1626,7 +1622,7 @@ void ContentFeatures::serializeOld(std::ostream &os, u16 protocol_version) const writeS16(os, i->second); } writeU8(os, drawtype); - writeF1000(os, compatible_visual_scale); + writeF1000(os, visual_scale); writeU8(os, 6); for (u32 i = 0; i < 6; i++) tiledef[i].serialize(os, protocol_version); @@ -1674,7 +1670,7 @@ void ContentFeatures::serializeOld(std::ostream &os, u16 protocol_version) const writeS16(os, i->second); } writeU8(os, drawtype); - writeF1000(os, compatible_visual_scale); + writeF1000(os, visual_scale); writeU8(os, 6); for (u32 i = 0; i < 6; i++) tiledef[i].serialize(os, protocol_version); @@ -1728,7 +1724,7 @@ void ContentFeatures::serializeOld(std::ostream &os, u16 protocol_version) const writeS16(os, i->second); } writeU8(os, drawtype); - writeF1000(os, compatible_visual_scale); + writeF1000(os, visual_scale); writeU8(os, 6); for (u32 i = 0; i < 6; i++) tiledef[i].serialize(os, protocol_version); |