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

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

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);

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.

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)

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++;