BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Make it compile

Browse Source
This commit is contained in:
Sfan5 2013-09-06 18:22:12 +02:00
parent 58841ef12f
commit 7e44c2ace1
7 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/database-dummy.cpp
View File

@ -47,7 +47,7 @@ void Database_Dummy::saveBlock(MapBlock *block)
} }
// Format used for writing // Format used for writing
u8 version = SER_FMT_VER_HIGHEST; u8 version = SER_FMT_VER_HIGHEST_WRITE;
// Get destination // Get destination
v3s16 p3d = block->getPos(); v3s16 p3d = block->getPos();

2
src/database-leveldb.cpp
View File

@ -55,7 +55,7 @@ void Database_LevelDB::saveBlock(MapBlock *block)
} }
// Format used for writing // Format used for writing
u8 version = SER_FMT_VER_HIGHEST; u8 version = SER_FMT_VER_HIGHEST_WRITE;
// Get destination // Get destination
v3s16 p3d = block->getPos(); v3s16 p3d = block->getPos();

2
src/database-sqlite3.cpp
View File

@ -135,7 +135,7 @@ void Database_SQLite3::saveBlock(MapBlock *block)
} }
// Format used for writing // Format used for writing
u8 version = SER_FMT_VER_HIGHEST; u8 version = SER_FMT_VER_HIGHEST_WRITE;
// Get destination // Get destination
v3s16 p3d = block->getPos(); v3s16 p3d = block->getPos();

2
src/database.h
View File

@ -7,6 +7,8 @@
#include "mapblock.h" #include "mapblock.h"
#include "main.h" #include "main.h"
#include "filesys.h" #include "filesys.h"
#include "serialization.h"
#include <irrList.h>
class Database; class Database;
class ServerMap; class ServerMap;

8
src/main.cpp
View File

@ -795,8 +795,8 @@ int main(int argc, char *argv[])
allowed_options.insert(std::make_pair("gameid", ValueSpec(VALUETYPE_STRING, allowed_options.insert(std::make_pair("gameid", ValueSpec(VALUETYPE_STRING,
_("Set gameid (\"--gameid list\" prints available ones)")))); _("Set gameid (\"--gameid list\" prints available ones)"))));
#if USE_LEVELDB #if USE_LEVELDB
allowed_options.insert("migrate", ValueSpec(VALUETYPE_STRING, allowed_options.insert(std::make_pair("migrate", ValueSpec(VALUETYPE_STRING,
_("Migrate from current map backend to another"))); _("Migrate from current map backend to another"))));
#endif #endif
#ifndef SERVER #ifndef SERVER
allowed_options.insert(std::make_pair("videomodes", ValueSpec(VALUETYPE_FLAG, allowed_options.insert(std::make_pair("videomodes", ValueSpec(VALUETYPE_FLAG,
@ -1248,12 +1248,12 @@ int main(int argc, char *argv[])
return 1; return 1;
} }
core::list<v3s16> blocks; std::list<v3s16> blocks;
ServerMap &old_map = ((ServerMap&)server.getMap()); ServerMap &old_map = ((ServerMap&)server.getMap());
old_map.listAllLoadableBlocks(blocks); old_map.listAllLoadableBlocks(blocks);
int count = 0; int count = 0;
new_db->beginSave(); 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); MapBlock *block = old_map.loadBlock(*i);
new_db->saveBlock(block); new_db->saveBlock(block);
MapSector *sector = old_map.getSectorNoGenerate(v2s16(i->X, i->Z)); MapSector *sector = old_map.getSectorNoGenerate(v2s16(i->X, i->Z));

5
src/map.cpp
View File

@ -3371,7 +3371,10 @@ void ServerMap::listAllLoadableBlocks(std::list<v3s16> &dst)
errorstream<<"Map::listAllLoadableBlocks(): Result will be missing " errorstream<<"Map::listAllLoadableBlocks(): Result will be missing "
<<"all blocks that are stored in flat files"<<std::endl; <<"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) void ServerMap::listAllLoadedBlocks(std::list<v3s16> &dst)

1
src/server.h
View File

@ -32,6 +32,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "rollback_interface.h" // Needed for rollbackRevertActions() #include "rollback_interface.h" // Needed for rollbackRevertActions()
#include "util/numeric.h" #include "util/numeric.h"
#include "util/thread.h" #include "util/thread.h"
#include "environment.h"
#include <string> #include <string>
#include <list> #include <list>
#include <map> #include <map>