Omnicleanup: header cleanup, add ModApiUtil shared between game and mainmenu

[oweals/minetest.git] / src / mapsector.h

diff --git a/src/mapsector.h b/src/mapsector.h
index 74539ab240be6f22807a63ea9362f81a36b89a28..dac4ee8d634992d55d933b63e7d587e4b2863bcd 100644 (file)
--- a/src/mapsector.h
+++ b/src/mapsector.h
@@ -1,6 +1,6 @@
 /*
-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 Lesser General Public License as published by
@@ -20,10 +20,11 @@ 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 <ostream>
+#include <map>
+#include <list>
 
 class MapBlock;
 class Map;
@@ -60,7 +61,7 @@ public:
        
        void deleteBlock(MapBlock *block);
        
-       void getBlocks(core::list<MapBlock*> &dest);
+       void getBlocks(std::list<MapBlock*> &dest);
        
        // Always false at the moment, because sector contains no metadata.
        bool differs_from_disk;
@@ -68,7 +69,7 @@ public:
 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 @@ public:
                        std::istream &is,
                        Map *parent,
                        v2s16 p2d,
-                       core::map<v2s16, MapSector*> & sectors,
+                       std::map<v2s16, MapSector*> & sectors,
                        IGameDef *gamedef
                );