LocalPlayer::accelerateHorizontal: cleanups

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

diff --git a/src/mapnode.cpp b/src/mapnode.cpp
index cae3d0b14ce135fa278c848083e7a14eefbc76ff..fd28910ff6848f00a148bdf8829a8ff5f8daefe7 100644 (file)
--- a/src/mapnode.cpp
+++ b/src/mapnode.cpp
@@ -22,6 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "porting.h"
 #include "nodedef.h"
 #include "map.h"
+#include "content_mapnode.h" // For mapnode_translate_*_internal
 #include "serialization.h" // For ser_ver_supported
 #include "util/serialize.h"
 #include "log.h"
@@ -630,19 +631,25 @@ void MapNode::serialize(u8 *dest, u8 version)
 }
 void MapNode::deSerialize(u8 *source, u8 version)
 {
-       if (!ser_ver_supported(version))
+       if(!ser_ver_supported(version))
                throw VersionMismatchException("ERROR: MapNode format not supported");
 
-       if (version >= 24) {
-               param0 = readU16(source + 0);
-               param1 = readU8(source + 2);
-               param2 = readU8(source + 3);
-       } else {
-               param0 = readU8(source + 0);
-               param1 = readU8(source + 1);
-               param2 = readU8(source + 2);
-               if (param0 > 0x7F) {
-                       param0 |= ((param2 & 0xF0) << 4);
+       if(version <= 21)
+       {
+               deSerialize_pre22(source, version);
+               return;
+       }
+
+       if(version >= 24){
+               param0 = readU16(source+0);
+               param1 = readU8(source+2);
+               param2 = readU8(source+3);
+       }else{
+               param0 = readU8(source+0);
+               param1 = readU8(source+1);
+               param2 = readU8(source+2);
+               if(param0 > 0x7F){
+                       param0 |= ((param2&0xF0)<<4);
                        param2 &= 0x0F;
                }
        }
@@ -651,7 +658,7 @@ void MapNode::serializeBulk(std::ostream &os, int version,
                const MapNode *nodes, u32 nodecount,
                u8 content_width, u8 params_width, bool compressed)
 {
-       if(!ser_ver_supported(version))
+       if (!ser_ver_supported(version))
                throw VersionMismatchException("ERROR: MapNode format not supported");
 
        sanity_check(content_width == 2);
@@ -659,38 +666,33 @@ void MapNode::serializeBulk(std::ostream &os, int version,
 
        // Can't do this anymore; we have 16-bit dynamically allocated node IDs
        // in memory; conversion just won't work in this direction.
-       if(version < 24)
+       if (version < 24)
                throw SerializationError("MapNode::serializeBulk: serialization to "
                                "version < 24 not possible");
 
-       SharedBuffer<u8> databuf(nodecount * (content_width + params_width));
-
-       // Serialize content
-       for(u32 i=0; i<nodecount; i++)
-               writeU16(&databuf[i*2], nodes[i].param0);
+       size_t databuf_size = nodecount * (content_width + params_width);
+       u8 *databuf = new u8[databuf_size];
 
-       // Serialize param1
        u32 start1 = content_width * nodecount;
-       for(u32 i=0; i<nodecount; i++)
-               writeU8(&databuf[start1 + i], nodes[i].param1);
-
-       // Serialize param2
        u32 start2 = (content_width + 1) * nodecount;
-       for(u32 i=0; i<nodecount; i++)
+
+       // Serialize content
+       for (u32 i = 0; i < nodecount; i++) {
+               writeU16(&databuf[i * 2], nodes[i].param0);
+               writeU8(&databuf[start1 + i], nodes[i].param1);
                writeU8(&databuf[start2 + i], nodes[i].param2);
+       }
 
        /*
                Compress data to output stream
        */
 
-       if(compressed)
-       {
-               compressZlib(databuf, os);
-       }
+       if (compressed)
+               compressZlib(databuf, databuf_size, os);
        else
-       {
-               os.write((const char*) &databuf[0], databuf.getSize());
-       }
+               os.write((const char*) &databuf[0], databuf_size);
+
+       delete [] databuf;
 }
 
 // Deserialize bulk node data
@@ -764,3 +766,44 @@ void MapNode::deSerializeBulk(std::istream &is, int version,
        }
 }
 
+/*
+       Legacy serialization
+*/
+void MapNode::deSerialize_pre22(u8 *source, u8 version)
+{
+       if(version <= 1)
+       {
+               param0 = source[0];
+       }
+       else if(version <= 9)
+       {
+               param0 = source[0];
+               param1 = source[1];
+       }
+       else
+       {
+               param0 = source[0];
+               param1 = source[1];
+               param2 = source[2];
+               if(param0 > 0x7f){
+                       param0 <<= 4;
+                       param0 |= (param2&0xf0)>>4;
+                       param2 &= 0x0f;
+               }
+       }
+
+       // Convert special values from old version to new
+       if(version <= 19)
+       {
+               // In these versions, CONTENT_IGNORE and CONTENT_AIR
+               // are 255 and 254
+               // Version 19 is fucked up with sometimes the old values and sometimes not
+               if(param0 == 255)
+                       param0 = CONTENT_IGNORE;
+               else if(param0 == 254)
+                       param0 = CONTENT_AIR;
+       }
+
+       // Translate to our known version
+       *this = mapnode_translate_to_internal(*this, version);
+}