Move hex.h to util/

[dragonfireclient.git] / src / map.cpp

diff --git a/src/map.cpp b/src/map.cpp
index 434243a10f896d8416fe2bd2f3b173838fcb2f90..a9ff22c32ce324b55b9e84d1d5dd10858422eaa9 100644 (file)
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -1421,7 +1421,7 @@ bool Map::getDayNightDiff(v3s16 blockpos)
        Updates usage timers
 */
 void Map::timerUpdate(float dtime, float unload_timeout,
-               std::list<v3s16> *unloaded_blocks)
+               std::vector<v3s16> *unloaded_blocks)
 {
        bool save_before_unloading = (mapType() == MAPTYPE_SERVER);
 
@@ -1435,29 +1435,25 @@ void Map::timerUpdate(float dtime, float unload_timeout,
 
        beginSave();
        for(std::map<v2s16, MapSector*>::iterator si = m_sectors.begin();
-               si != m_sectors.end(); ++si)
-       {
+               si != m_sectors.end(); ++si) {
                MapSector *sector = si->second;
 
                bool all_blocks_deleted = true;
 
-               std::list<MapBlock*> blocks;
+               MapBlockVect blocks;
                sector->getBlocks(blocks);
 
-               for(std::list<MapBlock*>::iterator i = blocks.begin();
-                               i != blocks.end(); ++i)
-               {
+               for(MapBlockVect::iterator i = blocks.begin();
+                               i != blocks.end(); ++i) {
                        MapBlock *block = (*i);
 
                        block->incrementUsageTimer(dtime);
 
-                       if(block->refGet() == 0 && block->getUsageTimer() > unload_timeout)
-                       {
+                       if(block->refGet() == 0 && block->getUsageTimer() > unload_timeout) {
                                v3s16 p = block->getPos();
 
                                // Save if modified
-                               if (block->getModified() != MOD_STATE_CLEAN && save_before_unloading)
-                               {
+                               if (block->getModified() != MOD_STATE_CLEAN && save_before_unloading) {
                                        modprofiler.add(block->getModifiedReason(), 1);
                                        if (!saveBlock(block))
                                                continue;
@@ -1472,15 +1468,13 @@ void Map::timerUpdate(float dtime, float unload_timeout,
 
                                deleted_blocks_count++;
                        }
-                       else
-                       {
+                       else {
                                all_blocks_deleted = false;
                                block_count_all++;
                        }
                }
 
-               if(all_blocks_deleted)
-               {
+               if(all_blocks_deleted) {
                        sector_deletion_queue.push_back(si->first);
                }
        }
@@ -1506,7 +1500,7 @@ void Map::timerUpdate(float dtime, float unload_timeout,
        }
 }
 
-void Map::unloadUnreferencedBlocks(std::list<v3s16> *unloaded_blocks)
+void Map::unloadUnreferencedBlocks(std::vector<v3s16> *unloaded_blocks)
 {
        timerUpdate(0.0, -1.0, unloaded_blocks);
 }
@@ -1863,11 +1857,11 @@ void Map::transformLiquids(std::map<v3s16, MapBlock*> & modified_blocks)
 
                // Find out whether there is a suspect for this action
                std::string suspect;
-               if(m_gamedef->rollback()){
+               if(m_gamedef->rollback()) {
                        suspect = m_gamedef->rollback()->getSuspect(p0, 83, 1);
                }
 
-               if(!suspect.empty()){
+               if(m_gamedef->rollback() && !suspect.empty()){
                        // Blame suspect
                        RollbackScopeActor rollback_scope(m_gamedef->rollback(), suspect, true);
                        // Get old node for rollback
@@ -2983,8 +2977,7 @@ std::string ServerMap::getBlockFilename(v3s16 p)
 void ServerMap::save(ModifiedState save_level)
 {
        DSTACK(__FUNCTION_NAME);
-       if(m_map_saving_enabled == false)
-       {
+       if(m_map_saving_enabled == false) {
                infostream<<"WARNING: Not saving map, saving disabled."<<std::endl;
                return;
        }
@@ -2993,8 +2986,7 @@ void ServerMap::save(ModifiedState save_level)
                infostream<<"ServerMap: Saving whole map, this can take time."
                                <<std::endl;
 
-       if(m_map_metadata_changed || save_level == MOD_STATE_CLEAN)
-       {
+       if(m_map_metadata_changed || save_level == MOD_STATE_CLEAN) {
                saveMapMeta();
        }
 
@@ -3009,30 +3001,27 @@ void ServerMap::save(ModifiedState save_level)
        bool save_started = false;
 
        for(std::map<v2s16, MapSector*>::iterator i = m_sectors.begin();
-               i != m_sectors.end(); ++i)
-       {
+               i != m_sectors.end(); ++i) {
                ServerMapSector *sector = (ServerMapSector*)i->second;
                assert(sector->getId() == MAPSECTOR_SERVER);
 
-               if(sector->differs_from_disk || save_level == MOD_STATE_CLEAN)
-               {
+               if(sector->differs_from_disk || save_level == MOD_STATE_CLEAN) {
                        saveSectorMeta(sector);
                        sector_meta_count++;
                }
-               std::list<MapBlock*> blocks;
+
+               MapBlockVect blocks;
                sector->getBlocks(blocks);
 
-               for(std::list<MapBlock*>::iterator j = blocks.begin();
-                       j != blocks.end(); ++j)
-               {
+               for(MapBlockVect::iterator j = blocks.begin();
+                       j != blocks.end(); ++j) {
                        MapBlock *block = *j;
 
                        block_count_all++;
 
-                       if(block->getModified() >= (u32)save_level)
-                       {
+                       if(block->getModified() >= (u32)save_level) {
                                // Lazy beginSave()
-                               if(!save_started){
+                               if(!save_started) {
                                        beginSave();
                                        save_started = true;
                                }
@@ -3050,6 +3039,7 @@ void ServerMap::save(ModifiedState save_level)
                        }
                }
        }
+
        if(save_started)
                endSave();
 
@@ -3057,8 +3047,7 @@ void ServerMap::save(ModifiedState save_level)
                Only print if something happened or saved whole map
        */
        if(save_level == MOD_STATE_CLEAN || sector_meta_count != 0
-                       || block_count != 0)
-       {
+                       || block_count != 0) {
                infostream<<"ServerMap: Written: "
                                <<sector_meta_count<<" sector metadata files, "
                                <<block_count<<" block files"
@@ -3070,7 +3059,7 @@ void ServerMap::save(ModifiedState save_level)
        }
 }
 
-void ServerMap::listAllLoadableBlocks(std::list<v3s16> &dst)
+void ServerMap::listAllLoadableBlocks(std::vector<v3s16> &dst)
 {
        if(loadFromFolders()){
                errorstream<<"Map::listAllLoadableBlocks(): Result will be missing "
@@ -3079,21 +3068,19 @@ void ServerMap::listAllLoadableBlocks(std::list<v3s16> &dst)
        dbase->listAllLoadableBlocks(dst);
 }
 
-void ServerMap::listAllLoadedBlocks(std::list<v3s16> &dst)
+void ServerMap::listAllLoadedBlocks(std::vector<v3s16> &dst)
 {
        for(std::map<v2s16, MapSector*>::iterator si = m_sectors.begin();
                si != m_sectors.end(); ++si)
        {
                MapSector *sector = si->second;
 
-               std::list<MapBlock*> blocks;
+               MapBlockVect blocks;
                sector->getBlocks(blocks);
 
-               for(std::list<MapBlock*>::iterator i = blocks.begin();
-                               i != blocks.end(); ++i)
-               {
-                       MapBlock *block = (*i);
-                       v3s16 p = block->getPos();
+               for(MapBlockVect::iterator i = blocks.begin();
+                               i != blocks.end(); ++i) {
+                       v3s16 p = (*i)->getPos();
                        dst.push_back(p);
                }
        }
@@ -3109,7 +3096,7 @@ void ServerMap::saveMapMeta()
 
        createDirs(m_savedir);
 
-       std::string fullpath = m_savedir + DIR_DELIM + "map_meta.txt";
+       std::string fullpath = m_savedir + DIR_DELIM "map_meta.txt";
        std::ostringstream ss(std::ios_base::binary);
 
        Settings params;
@@ -3133,19 +3120,21 @@ void ServerMap::loadMapMeta()
 {
        DSTACK(__FUNCTION_NAME);
 
+       Settings params;
        std::string fullpath = m_savedir + DIR_DELIM "map_meta.txt";
-       std::ifstream is(fullpath.c_str(), std::ios_base::binary);
-       if (!is.good()) {
-               errorstream << "ServerMap::loadMapMeta(): "
-                               << "could not open" << fullpath << std::endl;
-               throw FileNotGoodException("Cannot open map metadata");
-       }
 
-       Settings params;
+       if (fs::PathExists(fullpath)) {
+               std::ifstream is(fullpath.c_str(), std::ios_base::binary);
+               if (!is.good()) {
+                       errorstream << "ServerMap::loadMapMeta(): "
+                               "could not open " << fullpath << std::endl;
+                       throw FileNotGoodException("Cannot open map metadata");
+               }
 
-       if (!params.parseConfigLines(is, "[end_of_params]")) {
-               throw SerializationError("ServerMap::loadMapMeta(): "
+               if (!params.parseConfigLines(is, "[end_of_params]")) {
+                       throw SerializationError("ServerMap::loadMapMeta(): "
                                "[end_of_params] not found!");
+               }
        }
 
        m_emerge->loadParamsFromSettings(&params);
@@ -3220,8 +3209,6 @@ bool ServerMap::loadSectorMeta(v2s16 p2d)
 {
        DSTACK(__FUNCTION_NAME);
 
-       MapSector *sector = NULL;
-
        // The directory layout we're going to load from.
        //  1 - original sectors/xxxxzzzz/
        //  2 - new sectors2/xxx/zzz/
@@ -3241,7 +3228,7 @@ bool ServerMap::loadSectorMeta(v2s16 p2d)
        }
 
        try{
-               sector = loadSectorMeta(sectordir, loadlayout != 2);
+               loadSectorMeta(sectordir, loadlayout != 2);
        }
        catch(InvalidFilenameException &e)
        {