Readded and optimized mapgen V6

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

diff --git a/src/mapsector.h b/src/mapsector.h
index 44f45d8f03ec98fd971307ef44d2510f2392955a..74539ab240be6f22807a63ea9362f81a36b89a28 100644 (file)
--- a/src/mapsector.h
+++ b/src/mapsector.h
@@ -3,34 +3,31 @@ Minetest-c55
 Copyright (C) 2010 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 "irrlichttypes_bloated.h"
 #include "exceptions.h"
 #include <ostream>
 
 class MapBlock;
 class Map;
+class IGameDef;
 
 /*
        This is an Y-wise stack of MapBlocks.
@@ -43,7 +40,7 @@ class MapSector
 {
 public:
        
-       MapSector(Map *parent, v2s16 pos);
+       MapSector(Map *parent, v2s16 pos, IGameDef *gamedef);
        virtual ~MapSector();
 
        virtual u32 getId() const = 0;
@@ -76,7 +73,9 @@ protected:
        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 
        MapBlock *m_block_cache;
@@ -92,7 +91,7 @@ protected:
 class ServerMapSector : public MapSector
 {
 public:
-       ServerMapSector(Map *parent, v2s16 pos);
+       ServerMapSector(Map *parent, v2s16 pos, IGameDef *gamedef);
        ~ServerMapSector();
        
        u32 getId() const
@@ -111,7 +110,8 @@ public:
                        std::istream &is,
                        Map *parent,
                        v2s16 p2d,
-                       core::map<v2s16, MapSector*> & sectors
+                       core::map<v2s16, MapSector*> & sectors,
+                       IGameDef *gamedef
                );
                
 private:
@@ -121,7 +121,7 @@ private:
 class ClientMapSector : public MapSector
 {
 public:
-       ClientMapSector(Map *parent, v2s16 pos);
+       ClientMapSector(Map *parent, v2s16 pos, IGameDef *gamedef);
        ~ClientMapSector();
        
        u32 getId() const