diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-06-18 15:16:35 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-06-18 15:16:35 +0300 |
| commit | 5ac900ddd9d574440b499b15516747a374fe3a5a (patch) | |
| tree | e0aecb9e356d140150ebb171bd589ff70d00d8a5 | |
| parent | c7ab4f15a506fac64e2b6cc03121f74da6677a32 (diff) | |
| download | minetest-5ac900ddd9d574440b499b15516747a374fe3a5a.tar.gz minetest-5ac900ddd9d574440b499b15516747a374fe3a5a.tar.bz2 minetest-5ac900ddd9d574440b499b15516747a374fe3a5a.zip | |
Changed MapBlockObjects to be never written anymore. Incremented version number.
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/map.cpp | 5 | ||||
| -rw-r--r-- | src/mapblock.cpp | 4 | ||||
| -rw-r--r-- | src/mapblock.h | 4 | ||||
| -rw-r--r-- | src/server.cpp | 4 |
5 files changed, 12 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c62d18e6f..70d20dea4 100644 --- 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 5cea4ebca..adcdaffee 100644 --- 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 db7894a7b..2dfb07f90 100644 --- 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 dd1d5e5aa..ca36499ac 100644 --- 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 9fa957c2a..d3627a93f 100644 --- 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++; |