Decrease minimum for repeat_place_time (#13165)

[minetest.git] / src / mapsector.h

diff --git a/src/mapsector.h b/src/mapsector.h
index 4f2b3f31feb35acf3a555f51ba3168ded618d52b..ffd4cdd1daa142b48634661dc4dd164a714a9fc9 100644 (file)
--- a/src/mapsector.h
+++ b/src/mapsector.h
@@ -17,17 +17,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef MAPSECTOR_HEADER
-#define MAPSECTOR_HEADER
+#pragma once
 
-#include <jmutex.h>
-#include "irrlichttypes_bloated.h"
-#include "exceptions.h"
+#include "irrlichttypes.h"
+#include "irr_v2d.h"
+#include "mapblock.h"
 #include <ostream>
 #include <map>
-#include <list>
+#include <vector>
 
-class MapBlock;
 class Map;
 class IGameDef;
 
@@ -41,12 +39,10 @@ class IGameDef;
 class MapSector
 {
 public:
-       
+
        MapSector(Map *parent, v2s16 pos, IGameDef *gamedef);
        virtual ~MapSector();
 
-       virtual u32 getId() const = 0;
-
        void deleteBlocks();
 
        v2s16 getPos()
@@ -59,81 +55,33 @@ class MapSector
        MapBlock * createBlankBlock(s16 y);
 
        void insertBlock(MapBlock *block);
-       
+
        void deleteBlock(MapBlock *block);
-       
-       void getBlocks(std::list<MapBlock*> &dest);
-       
-       // Always false at the moment, because sector contains no metadata.
-       bool differs_from_disk;
 
+       void getBlocks(MapBlockVect &dest);
+
+       bool empty() const { return m_blocks.empty(); }
+
+       int size() const { return m_blocks.size(); }
 protected:
-       
+
        // The pile of MapBlocks
-       std::map<s16, MapBlock*> m_blocks;
+       std::unordered_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 
-       MapBlock *m_block_cache;
+       // Be sure to set this to nullptr when the cached block is deleted
+       MapBlock *m_block_cache = nullptr;
        s16 m_block_cache_y;
-       
+
        /*
                Private methods
        */
        MapBlock *getBlockBuffered(s16 y);
 
 };
-
-class ServerMapSector : public MapSector
-{
-public:
-       ServerMapSector(Map *parent, v2s16 pos, IGameDef *gamedef);
-       ~ServerMapSector();
-       
-       u32 getId() const
-       {
-               return MAPSECTOR_SERVER;
-       }
-
-       /*
-               These functions handle metadata.
-               They do not handle blocks.
-       */
-
-       void serialize(std::ostream &os, u8 version);
-       
-       static ServerMapSector* deSerialize(
-                       std::istream &is,
-                       Map *parent,
-                       v2s16 p2d,
-                       std::map<v2s16, MapSector*> & sectors,
-                       IGameDef *gamedef
-               );
-               
-private:
-};
-
-#ifndef SERVER
-class ClientMapSector : public MapSector
-{
-public:
-       ClientMapSector(Map *parent, v2s16 pos, IGameDef *gamedef);
-       ~ClientMapSector();
-       
-       u32 getId() const
-       {
-               return MAPSECTOR_CLIENT;
-       }
-
-private:
-};
-#endif
-       
-#endif
-