diff options
| author | Sfan5 <sfan5@live.de> | 2013-09-06 18:22:12 +0200 |
|---|---|---|
| committer | Sfan5 <sfan5@live.de> | 2013-09-09 22:50:50 +0200 |
| commit | 7e44c2ace136a5dfe1c999167bb0aadcb8a78c4f (patch) | |
| tree | 5dc9d41c5690ace1d01a8d43814cdfbef732f980 /src/main.cpp | |
| parent | 58841ef12f6cba1bb622353c1fcaa0e3c6fb46c9 (diff) | |
| download | minetest-7e44c2ace136a5dfe1c999167bb0aadcb8a78c4f.tar.gz minetest-7e44c2ace136a5dfe1c999167bb0aadcb8a78c4f.tar.bz2 minetest-7e44c2ace136a5dfe1c999167bb0aadcb8a78c4f.zip | |
Make it compile
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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<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)); |