diff options
| author | Jürgen Doser <jurgen.doser@gmail.com> | 2013-01-25 01:37:19 +0100 |
|---|---|---|
| committer | PilzAdam <pilzadam@minetest.net> | 2013-03-23 23:10:47 +0100 |
| commit | dacc8cdb3a0e824b435f9f4d98beb471f7a8be64 (patch) | |
| tree | 78c6ed09414932c3ee1b8730845b7b58c60e4511 | |
| parent | ca7043e52d6a5d0ee1b91f287371fbe7f216697e (diff) | |
| download | minetest-dacc8cdb3a0e824b435f9f4d98beb471f7a8be64.tar.gz minetest-dacc8cdb3a0e824b435f9f4d98beb471f7a8be64.tar.bz2 minetest-dacc8cdb3a0e824b435f9f4d98beb471f7a8be64.zip | |
Include backface_culling flag in serialization format for TileDefs
This way flowing liquids actually show the backface when specified to
do so. Without this, TileDefs where by default initialized with
backface_culling = true and never set otherwise.
For backwards compatibility, an old client connected to a new server,
or a new client connected to an old server will behave like before
i.e., backface_culling is always true.
| -rw-r--r-- | src/clientserver.h | 4 | ||||
| -rw-r--r-- | src/nodedef.cpp | 21 | ||||
| -rw-r--r-- | src/nodedef.h | 2 |
3 files changed, 17 insertions, 10 deletions
diff --git a/src/clientserver.h b/src/clientserver.h index 769272a68..3292d1e9e 100644 --- a/src/clientserver.h +++ b/src/clientserver.h @@ -79,9 +79,11 @@ SharedBuffer<u8> makePacket_TOCLIENT_TIME_OF_DAY(u16 time, float time_speed); Serialization format changes PROTOCOL_VERSION 16: TOCLIENT_SHOW_FORMSPEC + PROTOCOL_VERSION 17: + Serialization format change: include backface_culling flag in TileDef */ -#define LATEST_PROTOCOL_VERSION 16 +#define LATEST_PROTOCOL_VERSION 17 // Server's supported network protocol range #define SERVER_PROTOCOL_VERSION_MIN 13 diff --git a/src/nodedef.cpp b/src/nodedef.cpp index 9a1145a8e..7f6c8a054 100644 --- a/src/nodedef.cpp +++ b/src/nodedef.cpp @@ -107,26 +107,31 @@ void NodeBox::deSerialize(std::istream &is) TileDef */ -void TileDef::serialize(std::ostream &os) const +void TileDef::serialize(std::ostream &os, u16 protocol_version) const { - writeU8(os, 0); // version + if(protocol_version >= 17) + writeU8(os, 1); + else + writeU8(os, 0); os<<serializeString(name); writeU8(os, animation.type); writeU16(os, animation.aspect_w); writeU16(os, animation.aspect_h); writeF1000(os, animation.length); + if(protocol_version >= 17) + writeU8(os, backface_culling); } void TileDef::deSerialize(std::istream &is) { int version = readU8(is); - if(version != 0) - throw SerializationError("unsupported TileDef version"); name = deSerializeString(is); animation.type = (TileAnimationType)readU8(is); animation.aspect_w = readU16(is); animation.aspect_h = readU16(is); animation.length = readF1000(is); + if(version >= 1) + backface_culling = readU8(is); } /* @@ -235,10 +240,10 @@ void ContentFeatures::serialize(std::ostream &os, u16 protocol_version) writeF1000(os, visual_scale); writeU8(os, 6); for(u32 i=0; i<6; i++) - tiledef[i].serialize(os); + tiledef[i].serialize(os, protocol_version); writeU8(os, CF_SPECIAL_COUNT); for(u32 i=0; i<CF_SPECIAL_COUNT; i++){ - tiledef_special[i].serialize(os); + tiledef_special[i].serialize(os, protocol_version); } writeU8(os, alpha); writeU8(os, post_effect_color.getAlpha()); @@ -809,10 +814,10 @@ void ContentFeatures::serializeOld(std::ostream &os, u16 protocol_version) writeF1000(os, visual_scale); writeU8(os, 6); for(u32 i=0; i<6; i++) - tiledef[i].serialize(os); + tiledef[i].serialize(os, protocol_version); writeU8(os, CF_SPECIAL_COUNT); for(u32 i=0; i<CF_SPECIAL_COUNT; i++){ - tiledef_special[i].serialize(os); + tiledef_special[i].serialize(os, protocol_version); } writeU8(os, alpha); writeU8(os, post_effect_color.getAlpha()); diff --git a/src/nodedef.h b/src/nodedef.h index b3f972b9b..4f07565d1 100644 --- a/src/nodedef.h +++ b/src/nodedef.h @@ -119,7 +119,7 @@ struct TileDef animation.length = 1.0; } - void serialize(std::ostream &os) const; + void serialize(std::ostream &os, u16 protocol_version) const; void deSerialize(std::istream &is); }; |