Changed MapBlockObjects to be never written anymore. Incremented version number.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c62d18e6f8319abed6ee57194b49e8a3bc311e55..70d20dea4041f513f34fe53bf3bff783fcec1d6e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@ project(minetest)
 
 set(VERSION_MAJOR 0)
 set(VERSION_MINOR 2)
-set(VERSION_PATCH 20110602_1_dev)
+set(VERSION_PATCH 20110618_0_dev)
 set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
 # Configuration options

diff --git a/src/map.cpp b/src/map.cpp
index 5cea4ebca34c39bb3b269c989c11b858906a3029..adcdaffee92d599305186176b5ead5b224d70b40 100644 (file)
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -5545,8 +5545,9 @@ void ServerMap::loadBlock(std::string sectordir, std::string blockfile, MapSecto
        catch(SerializationError &e)
        {
                dstream<<"WARNING: Invalid block data on disk "
-                               "(SerializationError). "
-                               "what()="<<e.what()
+                               <<"fullpath="<<fullpath
+                               <<" (SerializationError). "
+                               <<"what()="<<e.what()
                                <<std::endl;
                                //" Ignoring. A new one will be generated.
                assert(0);

diff --git a/src/mapblock.cpp b/src/mapblock.cpp
index db7894a7b4f2d0abf876c89a9d7085fac9fc4fd2..2dfb07f904a637c84ce2cd4a6f4c5d2836c0ffde 100644 (file)
--- a/src/mapblock.cpp
+++ b/src/mapblock.cpp
@@ -830,7 +830,9 @@ void MapBlock::serializeDiskExtra(std::ostream &os, u8 version)
        // Versions up from 9 have block objects.
        if(version >= 9)
        {
-               serializeObjects(os, version);
+               //serializeObjects(os, version); // DEPRECATED
+               // count=0
+               writeU16(os, 0);
        }
        
        // Versions up from 15 have static objects.

diff --git a/src/mapblock.h b/src/mapblock.h
index dd1d5e5aa590dd8ee5888ed260b3f079a2529752..ca36499acaa87930cd93230226ce9db1f8016078 100644 (file)
--- a/src/mapblock.h
+++ b/src/mapblock.h
@@ -366,10 +366,10 @@ public:
                DEPRECATED
        */
        
-       void serializeObjects(std::ostream &os, u8 version)
+       /*void serializeObjects(std::ostream &os, u8 version)
        {
                m_objects.serialize(os, version);
-       }
+       }*/
        // If smgr!=NULL, new objects are added to the scene
        void updateObjects(std::istream &is, u8 version,
                        scene::ISceneManager *smgr, u32 daynight_ratio)

diff --git a/src/server.cpp b/src/server.cpp
index 9fa957c2afa2b498b705715cbc974b6b20ee5154..d3627a93f4317ff6475e110e71e24906ff8ae0e9 100644 (file)
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -873,7 +873,9 @@ void RemoteClient::SendObjectData(
                        bos.write((char*)buf, 6);
 
                        // Write objects
-                       block->serializeObjects(bos, serialization_version);
+                       //block->serializeObjects(bos, serialization_version); // DEPRECATED
+                       // count=0
+                       writeU16(bos, 0);
 
                        blockcount++;