Fix mapgen using unitialised height map values

[minetest.git] / src / mapsector.h

diff --git a/src/mapsector.h b/src/mapsector.h
index 88fc76b571974a1e6cce5d6d1ef7da2861da15ea..e89247a92e0d1784d4817307385cc35910de5e5f 100644 (file)
--- a/src/mapsector.h
+++ b/src/mapsector.h
@@ -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;
 
@@ -60,7 +61,7 @@ class MapSector
        
        void deleteBlock(MapBlock *block);
        
-       void getBlocks(core::list<MapBlock*> &dest);
+       void getBlocks(MapBlockVect &dest);
        
        // Always false at the moment, because sector contains no metadata.
        bool differs_from_disk;
@@ -68,7 +69,7 @@ class MapSector
 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)
@@ -110,7 +111,7 @@ class ServerMapSector : public MapSector
                        std::istream &is,
                        Map *parent,
                        v2s16 p2d,
-                       core::map<v2s16, MapSector*> & sectors,
+                       std::map<v2s16, MapSector*> & sectors,
                        IGameDef *gamedef
                );