Update and fix doc/mapformat.txt; make current format more solid in mapblock.cpp

[dragonfireclient.git] / src / mapblock.cpp

diff --git a/src/mapblock.cpp b/src/mapblock.cpp
index 70a0f6ed00d4060650ff313a459108a454151e42..c4d3c422ea524ee088acba01b63144b58394163a 100644 (file)
--- a/src/mapblock.cpp
+++ b/src/mapblock.cpp
@@ -616,9 +616,13 @@ void MapBlock::serialize(std::ostream &os, u8 version, bool disk)
        */
        if(disk)
        {
-               // Node timers
-               if(version >= 23)
-                       m_node_timers.serialize(os);
+               // Version 23 doesn't actually contain node timers
+               // (this field should have not been added)
+               if(version == 23)
+                       writeU8(os, 0);
+               // Node timers (uncomment when node timers are taken into use)
+               /*if(version >= 24)
+                       m_node_timers.serialize(os);*/
 
                // Static objects
                m_static_objects.serialize(os);
@@ -698,11 +702,15 @@ void MapBlock::deSerialize(std::istream &is, u8 version, bool disk)
        if(disk)
        {
                // Node timers
-               if(version >= 23){
+               if(version == 23)
+                       // Read unused zero
+                       readU8(is);
+               // Uncomment when node timers are taken into use
+               /*else if(version >= 24){
                        TRACESTREAM(<<"MapBlock::deSerialize "<<PP(getPos())
                                        <<": Node timers"<<std::endl);
                        m_node_timers.deSerialize(is);
-               }
+               }*/
 
                // Static objects
                TRACESTREAM(<<"MapBlock::deSerialize "<<PP(getPos())