Small fixes of minetest.has_feature

[minetest.git] / src / mapsector.cpp

diff --git a/src/mapsector.cpp b/src/mapsector.cpp
index ebb050ec364be99b060ef7af72d88a41351293ef..9ce3c8eb321666204a3a288fe1e9701c2eccd132 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),
@@ -62,7 +59,7 @@ MapBlock * MapSector::getBlockBuffered(s16 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())
@@ -73,11 +70,11 @@ MapBlock * MapSector::getBlockBuffered(s16 y)
        else{
                block = n->second;
        }
-       
+
        // Cache the last result
        m_block_cache_y = y;
        m_block_cache = block;
-       
+
        return block;
 }
 
@@ -88,19 +85,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;
@@ -117,7 +114,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;
 }
@@ -128,7 +125,7 @@ void MapSector::deleteBlock(MapBlock *block)
 
        // Clear from cache
        m_block_cache = NULL;
-       
+
        // Remove from container
        m_blocks.erase(block_y);
 
@@ -136,7 +133,7 @@ void MapSector::deleteBlock(MapBlock *block)
        delete block;
 }
 
-void MapSector::getBlocks(std::list<MapBlock*> &dest)
+void MapSector::getBlocks(MapBlockVect &dest)
 {
        for(std::map<s16, MapBlock*>::iterator bi = m_blocks.begin();
                bi != m_blocks.end(); ++bi)
@@ -145,6 +142,11 @@ void MapSector::getBlocks(std::list<MapBlock*> &dest)
        }
 }
 
+bool MapSector::empty()
+{
+       return m_blocks.empty();
+}
+
 /*
        ServerMapSector
 */
@@ -162,18 +164,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
        */
@@ -196,18 +198,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
        */