Add count based unload limit for mapblocks

[dragonfireclient.git] / src / mapsector.h

diff --git a/src/mapsector.h b/src/mapsector.h
index 44f45d8f03ec98fd971307ef44d2510f2392955a..4c1ce86a3ac6077412f58ed7546e42a478539873 100644 (file)
--- a/src/mapsector.h
+++ b/src/mapsector.h
@@ -1,36 +1,34 @@
 /*
-Minetest-c55
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-/*
-(c) 2010 Perttu Ahola <celeron55@gmail.com>
-*/
-
 #ifndef MAPSECTOR_HEADER
 #define MAPSECTOR_HEADER
 
-#include <jmutex.h>
-#include "common_irrlicht.h"
-#include "exceptions.h"
+#include "irrlichttypes.h"
+#include "irr_v2d.h"
+#include "mapblock.h"
 #include <ostream>
+#include <map>
+#include <vector>
 
-class MapBlock;
 class Map;
+class IGameDef;
 
 /*
        This is an Y-wise stack of MapBlocks.
@@ -42,8 +40,8 @@ class Map;
 class MapSector
 {
 public:
-       
-       MapSector(Map *parent, v2s16 pos);
+
+       MapSector(Map *parent, v2s16 pos, IGameDef *gamedef);
        virtual ~MapSector();
 
        virtual u32 getId() const = 0;
@@ -60,28 +58,32 @@ class MapSector
        MapBlock * createBlankBlock(s16 y);
 
        void insertBlock(MapBlock *block);
-       
+
        void deleteBlock(MapBlock *block);
-       
-       void getBlocks(core::list<MapBlock*> &dest);
-       
+
+       void getBlocks(MapBlockVect &dest);
+
+       bool empty();
+
        // Always false at the moment, because sector contains no metadata.
        bool differs_from_disk;
 
 protected:
-       
+
        // The pile of MapBlocks
-       core::map<s16, MapBlock*> m_blocks;
+       std::map<s16, MapBlock*> m_blocks;
 
        Map *m_parent;
        // Position on parent (in MapBlock widths)
        v2s16 m_pos;
-       
+
+       IGameDef *m_gamedef;
+
        // Last-used block is cached here for quicker access.
-       // Be sure to set this to NULL when the cached block is deleted 
+       // Be sure to set this to NULL when the cached block is deleted
        MapBlock *m_block_cache;
        s16 m_block_cache_y;
-       
+
        /*
                Private methods
        */
@@ -92,9 +94,9 @@ class MapSector
 class ServerMapSector : public MapSector
 {
 public:
-       ServerMapSector(Map *parent, v2s16 pos);
+       ServerMapSector(Map *parent, v2s16 pos, IGameDef *gamedef);
        ~ServerMapSector();
-       
+
        u32 getId() const
        {
                return MAPSECTOR_SERVER;
@@ -106,14 +108,15 @@ class ServerMapSector : public MapSector
        */
 
        void serialize(std::ostream &os, u8 version);
-       
+
        static ServerMapSector* deSerialize(
                        std::istream &is,
                        Map *parent,
                        v2s16 p2d,
-                       core::map<v2s16, MapSector*> & sectors
+                       std::map<v2s16, MapSector*> & sectors,
+                       IGameDef *gamedef
                );
-               
+
 private:
 };
 
@@ -121,9 +124,9 @@ class ServerMapSector : public MapSector
 class ClientMapSector : public MapSector
 {
 public:
-       ClientMapSector(Map *parent, v2s16 pos);
+       ClientMapSector(Map *parent, v2s16 pos, IGameDef *gamedef);
        ~ClientMapSector();
-       
+
        u32 getId() const
        {
                return MAPSECTOR_CLIENT;
@@ -132,6 +135,6 @@ class ClientMapSector : public MapSector
 private:
 };
 #endif
-       
+
 #endif