Cleanup in content_mapblock (#5746)

[oweals/minetest.git] / src / mapblock.cpp

diff --git a/src/mapblock.cpp b/src/mapblock.cpp
index 840cb9b3994a28da789db0f898433e8da1cc49dd..ec10a49bb8c83a5346caca9dd385659eea995072 100644 (file)
--- a/src/mapblock.cpp
+++ b/src/mapblock.cpp
@@ -611,7 +611,7 @@ void MapBlock::serialize(std::ostream &os, u8 version, bool disk)
                Node metadata
        */
        std::ostringstream oss(std::ios_base::binary);
-       m_node_metadata.serialize(oss);
+       m_node_metadata.serialize(oss, version, disk);
        compressZlib(oss.str(), os);
 
        /*
@@ -640,19 +640,15 @@ void MapBlock::serialize(std::ostream &os, u8 version, bool disk)
        }
 }
 
-void MapBlock::serializeNetworkSpecific(std::ostream &os, u16 net_proto_version)
+void MapBlock::serializeNetworkSpecific(std::ostream &os)
 {
-       if(data == NULL)
-       {
+       if (!data) {
                throw SerializationError("ERROR: Not writing dummy block.");
        }
 
-       if(net_proto_version >= 21){
-               int version = 1;
-               writeU8(os, version);
-               writeF1000(os, 0); // deprecated heat
-               writeF1000(os, 0); // deprecated humidity
-       }
+       writeU8(os, 1); // version
+       writeF1000(os, 0); // deprecated heat
+       writeF1000(os, 0); // deprecated humidity
 }
 
 void MapBlock::deSerialize(std::istream &is, u8 version, bool disk)
@@ -673,11 +669,10 @@ void MapBlock::deSerialize(std::istream &is, u8 version, bool disk)
        u8 flags = readU8(is);
        is_underground = (flags & 0x01) ? true : false;
        m_day_night_differs = (flags & 0x02) ? true : false;
-       if (version < 27) {
+       if (version < 27)
                m_lighting_complete = 0xFFFF;
-       } else {
+       else
                m_lighting_complete = readU16(is);
-       }
        m_generated = (flags & 0x08) ? false : true;
 
        /*