Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-23 16:13:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Perttu Ahola 2011-06-18 15:16:35 +03:00
parent c7ab4f15a5
commit 5ac900ddd9
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -9,7 +9,7 @@ project(minetest)
set(VERSION_MAJOR 0) set(VERSION_MAJOR 0)
set(VERSION_MINOR 2) 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}") set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
# Configuration options # Configuration options

5
src/map.cpp
View File

@ -5545,8 +5545,9 @@ void ServerMap::loadBlock(std::string sectordir, std::string blockfile, MapSecto
catch(SerializationError &e) catch(SerializationError &e)
{ {
dstream<<"WARNING: Invalid block data on disk " dstream<<"WARNING: Invalid block data on disk "
"(SerializationError). " <<"fullpath="<<fullpath
"what()="<<e.what() <<" (SerializationError). "
<<"what()="<<e.what()
<<std::endl; <<std::endl;
//" Ignoring. A new one will be generated. //" Ignoring. A new one will be generated.
assert(0); assert(0);

4
src/mapblock.cpp
View File

@ -830,7 +830,9 @@ void MapBlock::serializeDiskExtra(std::ostream &os, u8 version)
// Versions up from 9 have block objects. // Versions up from 9 have block objects.
if(version >= 9) if(version >= 9)
{ {
serializeObjects(os, version); //serializeObjects(os, version); // DEPRECATED
// count=0
writeU16(os, 0);
} }
// Versions up from 15 have static objects. // Versions up from 15 have static objects.

4
src/mapblock.h
View File

@ -366,10 +366,10 @@ public:
DEPRECATED DEPRECATED
*/ */
void serializeObjects(std::ostream &os, u8 version) /*void serializeObjects(std::ostream &os, u8 version)
{ {
m_objects.serialize(os, version); m_objects.serialize(os, version);
} }*/
// If smgr!=NULL, new objects are added to the scene // If smgr!=NULL, new objects are added to the scene
void updateObjects(std::istream &is, u8 version, void updateObjects(std::istream &is, u8 version,
scene::ISceneManager *smgr, u32 daynight_ratio) scene::ISceneManager *smgr, u32 daynight_ratio)

4
src/server.cpp
View File

@ -873,7 +873,9 @@ void RemoteClient::SendObjectData(
bos.write((char*)buf, 6); bos.write((char*)buf, 6);
// Write objects // Write objects
block->serializeObjects(bos, serialization_version); //block->serializeObjects(bos, serialization_version); // DEPRECATED
// count=0
writeU16(bos, 0);
blockcount++; blockcount++;