Enable mod security by default

[dragonfireclient.git] / src / mapsector.cpp

diff --git a/src/mapsector.cpp b/src/mapsector.cpp
index 108effa79a6e888013c46faf56c92679a7c17eda..410689f5efe6c626c2e6ae67bee8daf5191923b9 100644 (file)
--- a/src/mapsector.cpp
+++ b/src/mapsector.cpp
@@ -18,12 +18,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include "mapsector.h"
-#include "jmutexautolock.h"
-#ifndef SERVER
-#include "client.h"
-#endif
 #include "exceptions.h"
 #include "mapblock.h"
+#include "serialization.h"
 
 MapSector::MapSector(Map *parent, v2s16 pos, IGameDef *gamedef):
                differs_from_disk(false),
@@ -45,10 +42,9 @@ void MapSector::deleteBlocks()
        m_block_cache = NULL;
 
        // Delete all
-       core::map<s16, MapBlock*>::Iterator i = m_blocks.getIterator();
-       for(; i.atEnd() == false; i++)
-       {
-               delete i.getNode()->getValue();
+       for (UNORDERED_MAP<s16, MapBlock*>::iterator i = m_blocks.begin();
+                       i != m_blocks.end(); ++i) {
+               delete i->second;
        }
 
        // Clear container
@@ -59,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
-       core::map<s16, MapBlock*>::Node *n = m_blocks.find(y);
-       if(n == NULL)
-       {
-               block = NULL;
-       }
-       // If block exists, return it
-       else{
-               block = n->getValue();
-       }
-       
+       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;
 }
 
@@ -88,20 +77,20 @@ 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.insert(y, block);
+
+       m_blocks[y] = block;
 
        return block;
 }
@@ -117,9 +106,9 @@ void MapSector::insertBlock(MapBlock *block)
 
        v2s16 p2d(block->getPos().X, block->getPos().Z);
        assert(p2d == m_pos);
-       
+
        // Insert into container
-       m_blocks.insert(block_y, block);
+       m_blocks[block_y] = block;
 }
 
 void MapSector::deleteBlock(MapBlock *block)
@@ -128,25 +117,19 @@ void MapSector::deleteBlock(MapBlock *block)
 
        // Clear from cache
        m_block_cache = NULL;
-       
+
        // Remove from container
-       m_blocks.remove(block_y);
+       m_blocks.erase(block_y);
 
        // Delete
        delete block;
 }
 
-void MapSector::getBlocks(core::list<MapBlock*> &dest)
+void MapSector::getBlocks(MapBlockVect &dest)
 {
-       core::list<MapBlock*> ref_list;
-
-       core::map<s16, MapBlock*>::Iterator bi;
-
-       bi = m_blocks.getIterator();
-       for(; bi.atEnd() == false; bi++)
-       {
-               MapBlock *b = bi.getNode()->getValue();
-               dest.push_back(b);
+       for (UNORDERED_MAP<s16, MapBlock*>::iterator bi = m_blocks.begin();
+               bi != m_blocks.end(); ++bi) {
+               dest.push_back(bi->second);
        }
 }
 
@@ -167,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
        */
@@ -189,7 +172,7 @@ ServerMapSector* ServerMapSector::deSerialize(
                std::istream &is,
                Map *parent,
                v2s16 p2d,
-               core::map<v2s16, MapSector*> & sectors,
+               std::map<v2s16, MapSector*> & sectors,
                IGameDef *gamedef
        )
 {
@@ -201,40 +184,40 @@ 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
        */
 
        ServerMapSector *sector = NULL;
 
-       core::map<v2s16, MapSector*>::Node *n = sectors.find(p2d);
+       std::map<v2s16, MapSector*>::iterator n = sectors.find(p2d);
 
-       if(n != NULL)
+       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;
 
-               MapSector *sector = n->getValue();
+               MapSector *sector = n->second;
                assert(sector->getId() == MAPSECTOR_SERVER);
                return (ServerMapSector*)sector;
        }
        else
        {
                sector = new ServerMapSector(parent, p2d, gamedef);
-               sectors.insert(p2d, sector);
+               sectors[p2d] = sector;
        }
 
        /*