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.

diff --git a/src/clientserver.h b/src/clientserver.h
index 769272a68a7db1344b1bef014830de360dfc7cc6..3292d1e9e944a642d5de023bb5fa5f8b96e1c75c 100644 (file)
--- 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 9a1145a8e856a8700782c9288e3a474e3bc97978..7f6c8a054a7354b9a2f87737e353ede6aafcb190 100644 (file)
--- 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 b3f972b9b3259296320c0a4aca308b8bba939be9..4f07565d1ad2073ded8fd09d44f3ec1e115a4ac9 100644 (file)
--- 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);
 };