Make it compile

sfan5 · sfan5 · commit 7e44c2ace136 · 2013-09-09T22:50:50.000+02:00
diff --git a/src/database-dummy.cpp b/src/database-dummy.cpp
@@ -47,7 +47,7 @@ void Database_Dummy::saveBlock(MapBlock *block)
 	}
 
 	// Format used for writing
-	u8 version = SER_FMT_VER_HIGHEST;
+	u8 version = SER_FMT_VER_HIGHEST_WRITE;
 	// Get destination
 	v3s16 p3d = block->getPos();
 
diff --git a/src/database-leveldb.cpp b/src/database-leveldb.cpp
@@ -55,7 +55,7 @@ void Database_LevelDB::saveBlock(MapBlock *block)
 	}
 
 	// Format used for writing
-	u8 version = SER_FMT_VER_HIGHEST;
+	u8 version = SER_FMT_VER_HIGHEST_WRITE;
 	// Get destination
 	v3s16 p3d = block->getPos();
 
diff --git a/src/database-sqlite3.cpp b/src/database-sqlite3.cpp
@@ -135,7 +135,7 @@ void Database_SQLite3::saveBlock(MapBlock *block)
 	}
 
 	// Format used for writing
-	u8 version = SER_FMT_VER_HIGHEST;
+	u8 version = SER_FMT_VER_HIGHEST_WRITE;
 	// Get destination
 	v3s16 p3d = block->getPos();
 	
diff --git a/src/database.h b/src/database.h
@@ -7,6 +7,8 @@
 #include "mapblock.h"
 #include "main.h"
 #include "filesys.h"
+#include "serialization.h"
+#include <irrList.h>
 
 class Database;
 class ServerMap;
diff --git a/src/main.cpp b/src/main.cpp
@@ -795,8 +795,8 @@ int main(int argc, char *argv[])
 	allowed_options.insert(std::make_pair("gameid", ValueSpec(VALUETYPE_STRING,
 			_("Set gameid (\"--gameid list\" prints available ones)"))));
 	#if USE_LEVELDB
-	allowed_options.insert("migrate", ValueSpec(VALUETYPE_STRING,
-			_("Migrate from current map backend to another")));
+	allowed_options.insert(std::make_pair("migrate", ValueSpec(VALUETYPE_STRING,
+			_("Migrate from current map backend to another"))));
 	#endif
 #ifndef SERVER
 	allowed_options.insert(std::make_pair("videomodes", ValueSpec(VALUETYPE_FLAG,
@@ -1248,12 +1248,12 @@ int main(int argc, char *argv[])
 				return 1;
 			}
 
-			core::list<v3s16> blocks;
+			std::list<v3s16> blocks;
 			ServerMap &old_map = ((ServerMap&)server.getMap());
 			old_map.listAllLoadableBlocks(blocks);
 			int count = 0;
 			new_db->beginSave();
-			for (core::list<v3s16>::Iterator i = blocks.begin(); i != blocks.end(); ++i) {
+			for (std::list<v3s16>::iterator i = blocks.begin(); i != blocks.end(); ++i) {
 				MapBlock *block = old_map.loadBlock(*i);
 				new_db->saveBlock(block);
 				MapSector *sector = old_map.getSectorNoGenerate(v2s16(i->X, i->Z));
diff --git a/src/map.cpp b/src/map.cpp
@@ -3371,7 +3371,10 @@ void ServerMap::listAllLoadableBlocks(std::list<v3s16> &dst)
 		errorstream<<"Map::listAllLoadableBlocks(): Result will be missing "
 				<<"all blocks that are stored in flat files"<<std::endl;
 	}
-	dbase->listAllLoadableBlocks(dst);
+	core::list<v3s16> dst_;
+	dbase->listAllLoadableBlocks(dst_);
+	for(core::list<v3s16>::Iterator i = dst_.begin(); i != dst_.end(); ++i)
+		dst.push_back(*i);
 }
 
 void ServerMap::listAllLoadedBlocks(std::list<v3s16> &dst)
diff --git a/src/server.h b/src/server.h
@@ -32,6 +32,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "rollback_interface.h" // Needed for rollbackRevertActions()
 #include "util/numeric.h"
 #include "util/thread.h"
+#include "environment.h"
 #include <string>
 #include <list>
 #include <map>

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ void Database_Dummy::saveBlock(MapBlock *block)`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`// Format used for writing`
`50`		`- u8 version = SER_FMT_VER_HIGHEST;`
	`50`	`+ u8 version = SER_FMT_VER_HIGHEST_WRITE;`
`51`	`51`	`// Get destination`
`52`	`52`	`v3s16 p3d = block->getPos();`
`53`	`53`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ void Database_LevelDB::saveBlock(MapBlock *block)`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`// Format used for writing`
`58`		`- u8 version = SER_FMT_VER_HIGHEST;`
	`58`	`+ u8 version = SER_FMT_VER_HIGHEST_WRITE;`
`59`	`59`	`// Get destination`
`60`	`60`	`v3s16 p3d = block->getPos();`
`61`	`61`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ void Database_SQLite3::saveBlock(MapBlock *block)`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`// Format used for writing`
`138`		`- u8 version = SER_FMT_VER_HIGHEST;`
	`138`	`+ u8 version = SER_FMT_VER_HIGHEST_WRITE;`
`139`	`139`	`// Get destination`
`140`	`140`	`v3s16 p3d = block->getPos();`
`141`	`141`
Original file line number	Diff line number	Diff line change
`@@ -3371,7 +3371,10 @@ void ServerMap::listAllLoadableBlocks(std::list<v3s16> &dst)`
`3371`	`3371`	`errorstream<<"Map::listAllLoadableBlocks(): Result will be missing "`
`3372`	`3372`	`<<"all blocks that are stored in flat files"<<std::endl;`
`3373`	`3373`	`}`
`3374`		`- dbase->listAllLoadableBlocks(dst);`
	`3374`	`+ core::list<v3s16> dst_;`
	`3375`	`+ dbase->listAllLoadableBlocks(dst_);`
	`3376`	`+ for(core::list<v3s16>::Iterator i = dst_.begin(); i != dst_.end(); ++i)`
	`3377`	`+ dst.push_back(*i);`
`3375`	`3378`	`}`
`3376`	`3379`
`3377`	`3380`	`void ServerMap::listAllLoadedBlocks(std::list<v3s16> &dst)`