Fix compile on certain Linux configurations, reduce spawn point height

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

diff --git a/src/mapsector.cpp b/src/mapsector.cpp
index 389714f409bfa572cb3cd0dac1b023376e819824..f152c38e7ad85f4ddf949458cd114eec64acc156 100644 (file)
--- a/src/mapsector.cpp
+++ b/src/mapsector.cpp
@@ -3,30 +3,33 @@ 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.
 */
 
 #include "mapsector.h"
 #include "jmutexautolock.h"
+#ifndef SERVER
 #include "client.h"
+#endif
 #include "exceptions.h"
 #include "mapblock.h"
 
-MapSector::MapSector(NodeContainer *parent, v2s16 pos):
+MapSector::MapSector(Map *parent, v2s16 pos, IGameDef *gamedef):
                differs_from_disk(false),
                m_parent(parent),
                m_pos(pos),
+               m_gamedef(gamedef),
                m_block_cache(NULL)
 {
 }
@@ -89,7 +92,7 @@ MapBlock * MapSector::createBlankBlockNoInsert(s16 y)
 
        v3s16 blockpos_map(m_pos.X, y, m_pos.Y);
        
-       MapBlock *block = new MapBlock(m_parent, blockpos_map);
+       MapBlock *block = new MapBlock(m_parent, blockpos_map, m_gamedef);
        
        return block;
 }
@@ -151,8 +154,8 @@ void MapSector::getBlocks(core::list<MapBlock*> &dest)
        ServerMapSector
 */
 
-ServerMapSector::ServerMapSector(NodeContainer *parent, v2s16 pos):
-               MapSector(parent, pos)
+ServerMapSector::ServerMapSector(Map *parent, v2s16 pos, IGameDef *gamedef):
+               MapSector(parent, pos, gamedef)
 {
 }
 
@@ -184,9 +187,10 @@ void ServerMapSector::serialize(std::ostream &os, u8 version)
 
 ServerMapSector* ServerMapSector::deSerialize(
                std::istream &is,
-               NodeContainer *parent,
+               Map *parent,
                v2s16 p2d,
-               core::map<v2s16, MapSector*> & sectors
+               core::map<v2s16, MapSector*> & sectors,
+               IGameDef *gamedef
        )
 {
        /*
@@ -229,7 +233,7 @@ ServerMapSector* ServerMapSector::deSerialize(
        }
        else
        {
-               sector = new ServerMapSector(parent, p2d);
+               sector = new ServerMapSector(parent, p2d, gamedef);
                sectors.insert(p2d, sector);
        }
 
@@ -247,8 +251,8 @@ ServerMapSector* ServerMapSector::deSerialize(
        ClientMapSector
 */
 
-ClientMapSector::ClientMapSector(NodeContainer *parent, v2s16 pos):
-               MapSector(parent, pos)
+ClientMapSector::ClientMapSector(Map *parent, v2s16 pos, IGameDef *gamedef):
+               MapSector(parent, pos, gamedef)
 {
 }