Huge LBM lookup performance improvement on mapblock loading (#7195)

[dragonfireclient.git] / src / map.cpp

diff --git a/src/map.cpp b/src/map.cpp
index 054338c926653d84d0558797e7ebfd64fa797cc5..35bdc3e9c95d511d47afbe371c9c53e74714e161 100644 (file)
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -1261,11 +1261,6 @@ 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(
@@ -2243,7 +2238,7 @@ void MMVManip::initialEmerge(v3s16 blockpos_min, v3s16 blockpos_max,
                bool block_data_inexistent = false;
                try
                {
-                       TimeTaker timer1("emerge load", &emerge_load_time);
+                       TimeTaker timer2("emerge load", &emerge_load_time);
 
                        block = m_map->getBlockNoCreate(p);
                        if(block->isDummy())