Fix click-digging torches (#5652)

[dragonfireclient.git] / src / mapsector.h

diff --git a/src/mapsector.h b/src/mapsector.h
index 0f4bcdd3ae6f1e5cbbb29eef3b8c3a0c2b1419d7..c3bff3575932432ff693e5fe16c50913a88984aa 100644 (file)
--- a/src/mapsector.h
+++ b/src/mapsector.h
@@ -1,6 +1,6 @@
 /*
 Minetest
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+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 Lesser General Public License as published by
@@ -20,12 +20,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef MAPSECTOR_HEADER
 #define MAPSECTOR_HEADER
 
-#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 <vector>
 
-class MapBlock;
 class Map;
 class IGameDef;
 
@@ -39,7 +40,7 @@ class IGameDef;
 class MapSector
 {
 public:
-       
+
        MapSector(Map *parent, v2s16 pos, IGameDef *gamedef);
        virtual ~MapSector();
 
@@ -57,30 +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() const { return m_blocks.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;
+       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 
+       // Be sure to set this to NULL when the cached block is deleted
        MapBlock *m_block_cache;
        s16 m_block_cache_y;
-       
+
        /*
                Private methods
        */
@@ -93,7 +96,7 @@ class ServerMapSector : public MapSector
 public:
        ServerMapSector(Map *parent, v2s16 pos, IGameDef *gamedef);
        ~ServerMapSector();
-       
+
        u32 getId() const
        {
                return MAPSECTOR_SERVER;
@@ -105,15 +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:
 };
 
@@ -123,7 +126,7 @@ class ClientMapSector : public MapSector
 public:
        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