Remove unused Map::getDayNightDiff + fix one undefined variable in mapblock.cpp

[dragonfireclient.git] / src / map.cpp

diff --git a/src/map.cpp b/src/map.cpp
index 641b7d2ddcb14d4566233922846c625b6b463ecf..972c666e4d6c4ce201824b033dc06140b3bdfffd 100644 (file)
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -65,12 +65,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 Map::Map(std::ostream &dout, IGameDef *gamedef):
        m_dout(dout),
        m_gamedef(gamedef),
-       m_sector_cache(NULL),
-       m_nodedef(gamedef->ndef()),
-       m_transforming_liquid_loop_count_multiplier(1.0f),
-       m_unprocessed_count(0),
-       m_inc_trending_up_start_time(0),
-       m_queue_size_timer_started(false)
+       m_nodedef(gamedef->ndef())
 {
 }
 
@@ -367,63 +362,6 @@ bool Map::removeNodeWithEvent(v3s16 p)
        return succeeded;
 }
 
-bool Map::getDayNightDiff(v3s16 blockpos)
-{
-       try{
-               v3s16 p = blockpos + v3s16(0,0,0);
-               MapBlock *b = getBlockNoCreate(p);
-               if(b->getDayNightDiff())
-                       return true;
-       }
-       catch(InvalidPositionException &e){}
-       // Leading edges
-       try{
-               v3s16 p = blockpos + v3s16(-1,0,0);
-               MapBlock *b = getBlockNoCreate(p);
-               if(b->getDayNightDiff())
-                       return true;
-       }
-       catch(InvalidPositionException &e){}
-       try{
-               v3s16 p = blockpos + v3s16(0,-1,0);
-               MapBlock *b = getBlockNoCreate(p);
-               if(b->getDayNightDiff())
-                       return true;
-       }
-       catch(InvalidPositionException &e){}
-       try{
-               v3s16 p = blockpos + v3s16(0,0,-1);
-               MapBlock *b = getBlockNoCreate(p);
-               if(b->getDayNightDiff())
-                       return true;
-       }
-       catch(InvalidPositionException &e){}
-       // Trailing edges
-       try{
-               v3s16 p = blockpos + v3s16(1,0,0);
-               MapBlock *b = getBlockNoCreate(p);
-               if(b->getDayNightDiff())
-                       return true;
-       }
-       catch(InvalidPositionException &e){}
-       try{
-               v3s16 p = blockpos + v3s16(0,1,0);
-               MapBlock *b = getBlockNoCreate(p);
-               if(b->getDayNightDiff())
-                       return true;
-       }
-       catch(InvalidPositionException &e){}
-       try{
-               v3s16 p = blockpos + v3s16(0,0,1);
-               MapBlock *b = getBlockNoCreate(p);
-               if(b->getDayNightDiff())
-                       return true;
-       }
-       catch(InvalidPositionException &e){}
-
-       return false;
-}
-
 struct TimeOrderedMapBlock {
        MapSector *sect;
        MapBlock *block;
@@ -1240,8 +1178,7 @@ ServerMap::ServerMap(const std::string &savedir, IGameDef *gamedef,
                EmergeManager *emerge):
        Map(dout_server, gamedef),
        settings_mgr(g_settings, savedir + DIR_DELIM + "map_meta.txt"),
-       m_emerge(emerge),
-       m_map_metadata_changed(true)
+       m_emerge(emerge)
 {
        verbosestream<<FUNCTION_NAME<<std::endl;
 
@@ -1378,6 +1315,11 @@ s16 ServerMap::getWaterLevel()
        return getMapgenParams()->water_level;
 }
 
+bool ServerMap::saoPositionOverLimit(const v3f &p)
+{
+       return getMapgenParams()->saoPosOverLimit(p);
+}
+
 bool ServerMap::blockpos_over_mapgen_limit(v3s16 p)
 {
        const s16 mapgen_limit_bp = rangelim(
@@ -1838,9 +1780,6 @@ MapBlock *ServerMap::getBlockOrEmerge(v3s16 p3d)
        return block;
 }
 
-void ServerMap::prepareBlock(MapBlock *block) {
-}
-
 // N.B.  This requires no synchronization, since data will not be modified unless
 // the VoxelManipulator being updated belongs to the same thread.
 void ServerMap::updateVManip(v3s16 pos)
@@ -2616,8 +2555,6 @@ bool ServerMap::repairBlockLight(v3s16 blockpos,
 
 MMVManip::MMVManip(Map *map):
                VoxelManipulator(),
-               m_is_dirty(false),
-               m_create_area(false),
                m_map(map)
 {
 }