Translated using Weblate (Chinese (Taiwan))

[dragonfireclient.git] / src / mapsector.cpp

diff --git a/src/mapsector.cpp b/src/mapsector.cpp
index 7bc4bd3a36216886ff436d497e96becd5f679e29..410689f5efe6c626c2e6ae67bee8daf5191923b9 100644 (file)
--- a/src/mapsector.cpp
+++ b/src/mapsector.cpp
@@ -42,9 +42,8 @@ void MapSector::deleteBlocks()
        m_block_cache = NULL;
 
        // Delete all
-       for(std::map<s16, MapBlock*>::iterator i = m_blocks.begin();
-               i != m_blocks.end(); ++i)
-       {
+       for (UNORDERED_MAP<s16, MapBlock*>::iterator i = m_blocks.begin();
+                       i != m_blocks.end(); ++i) {
                delete i->second;
        }
 
@@ -56,25 +55,18 @@ MapBlock * MapSector::getBlockBuffered(s16 y)
 {
        MapBlock *block;
 
-       if(m_block_cache != NULL && y == m_block_cache_y){
+       if (m_block_cache != NULL && y == m_block_cache_y) {
                return m_block_cache;
        }
-       
+
        // If block doesn't exist, return NULL
-       std::map<s16, MapBlock*>::iterator n = m_blocks.find(y);
-       if(n == m_blocks.end())
-       {
-               block = NULL;
-       }
-       // If block exists, return it
-       else{
-               block = n->second;
-       }
-       
+       UNORDERED_MAP<s16, MapBlock*>::iterator n = m_blocks.find(y);
+       block = (n != m_blocks.end() ? n->second : NULL);
+
        // Cache the last result
        m_block_cache_y = y;
        m_block_cache = block;
-       
+
        return block;
 }
 
@@ -85,19 +77,19 @@ MapBlock * MapSector::getBlockNoCreateNoEx(s16 y)
 
 MapBlock * MapSector::createBlankBlockNoInsert(s16 y)
 {
-       assert(getBlockBuffered(y) == NULL);
+       assert(getBlockBuffered(y) == NULL);    // Pre-condition
 
        v3s16 blockpos_map(m_pos.X, y, m_pos.Y);
-       
+
        MapBlock *block = new MapBlock(m_parent, blockpos_map, m_gamedef);
-       
+
        return block;
 }
 
 MapBlock * MapSector::createBlankBlock(s16 y)
 {
        MapBlock *block = createBlankBlockNoInsert(y);
-       
+
        m_blocks[y] = block;
 
        return block;
@@ -114,7 +106,7 @@ void MapSector::insertBlock(MapBlock *block)
 
        v2s16 p2d(block->getPos().X, block->getPos().Z);
        assert(p2d == m_pos);
-       
+
        // Insert into container
        m_blocks[block_y] = block;
 }
@@ -125,7 +117,7 @@ void MapSector::deleteBlock(MapBlock *block)
 
        // Clear from cache
        m_block_cache = NULL;
-       
+
        // Remove from container
        m_blocks.erase(block_y);
 
@@ -135,9 +127,8 @@ void MapSector::deleteBlock(MapBlock *block)
 
 void MapSector::getBlocks(MapBlockVect &dest)
 {
-       for(std::map<s16, MapBlock*>::iterator bi = m_blocks.begin();
-               bi != m_blocks.end(); ++bi)
-       {
+       for (UNORDERED_MAP<s16, MapBlock*>::iterator bi = m_blocks.begin();
+               bi != m_blocks.end(); ++bi) {
                dest.push_back(bi->second);
        }
 }
@@ -159,18 +150,18 @@ void ServerMapSector::serialize(std::ostream &os, u8 version)
 {
        if(!ser_ver_supported(version))
                throw VersionMismatchException("ERROR: MapSector format not supported");
-       
+
        /*
                [0] u8 serialization version
                + heightmap data
        */
-       
+
        // Server has both of these, no need to support not having them.
        //assert(m_objects != NULL);
 
        // Write version
        os.write((char*)&version, 1);
-       
+
        /*
                Add stuff here, if needed
        */
@@ -193,18 +184,18 @@ ServerMapSector* ServerMapSector::deSerialize(
        /*
                Read stuff
        */
-       
+
        // Read version
        u8 version = SER_FMT_VER_INVALID;
        is.read((char*)&version, 1);
-       
+
        if(!ser_ver_supported(version))
                throw VersionMismatchException("ERROR: MapSector format not supported");
-       
+
        /*
                Add necessary reading stuff here
        */
-       
+
        /*
                Get or create sector
        */
@@ -215,7 +206,7 @@ ServerMapSector* ServerMapSector::deSerialize(
 
        if(n != sectors.end())
        {
-               dstream<<"WARNING: deSerializing existent sectors not supported "
+               warningstream<<"deSerializing existent sectors not supported "
                                "at the moment, because code hasn't been tested."
                                <<std::endl;