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

[dragonfireclient.git] / src / mapsector.h

diff --git a/src/mapsector.h b/src/mapsector.h
index be9243e67bf49b25bc421fc9732061ab462d3103..dac4ee8d634992d55d933b63e7d587e4b2863bcd 100644 (file)
--- a/src/mapsector.h
+++ b/src/mapsector.h
@@ -1,33 +1,30 @@
 /*
-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 General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-/*
-(c) 2010 Perttu Ahola <celeron55@gmail.com>
-*/
-
 #ifndef MAPSECTOR_HEADER
 #define MAPSECTOR_HEADER
 
-#include <jmutex.h>
-#include "common_irrlicht.h"
-#include "exceptions.h"
+#include "irrlichttypes.h"
+#include "irr_v2d.h"
 #include <ostream>
+#include <map>
+#include <list>
 
 class MapBlock;
 class Map;
@@ -64,7 +61,7 @@ class MapSector
        
        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;
@@ -72,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)
@@ -114,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
                );