Decrease minimum for repeat_place_time (#13165)

[minetest.git] / src / mapsector.h

diff --git a/src/mapsector.h b/src/mapsector.h
index ddafbc77dfb015f6ced2879f9b76398bf2d5484c..ffd4cdd1daa142b48634661dc4dd164a714a9fc9 100644 (file)
--- a/src/mapsector.h
+++ b/src/mapsector.h
@@ -17,8 +17,7 @@ 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 "irrlichttypes.h"
 #include "irr_v2d.h"
@@ -44,8 +43,6 @@ class MapSector
        MapSector(Map *parent, v2s16 pos, IGameDef *gamedef);
        virtual ~MapSector();
 
-       virtual u32 getId() const = 0;
-
        void deleteBlocks();
 
        v2s16 getPos()
@@ -65,9 +62,7 @@ class MapSector
 
        bool empty() const { return m_blocks.empty(); }
 
-       // Always false at the moment, because sector contains no metadata.
-       bool differs_from_disk;
-
+       int size() const { return m_blocks.size(); }
 protected:
 
        // The pile of MapBlocks
@@ -80,8 +75,8 @@ class MapSector
        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;
 
        /*
@@ -90,51 +85,3 @@ class MapSector
        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
-