From 7e44c2ace136a5dfe1c999167bb0aadcb8a78c4f Mon Sep 17 00:00:00 2001 From: Sfan5 Date: Fri, 6 Sep 2013 18:22:12 +0200 Subject: Make it compile --- src/main.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index c49829592..98b600f9d 100644 --- 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 blocks; + std::list blocks; ServerMap &old_map = ((ServerMap&)server.getMap()); old_map.listAllLoadableBlocks(blocks); int count = 0; new_db->beginSave(); - for (core::list::Iterator i = blocks.begin(); i != blocks.end(); ++i) { + for (std::list::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)); -- cgit v1.2.3