X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fmap.cpp;h=35bdc3e9c95d511d47afbe371c9c53e74714e161;hb=392e80e3f13c977b5499eb424fa7d65085fb08f5;hp=054338c926653d84d0558797e7ebfd64fa797cc5;hpb=359c8f82ceaef19563d0dba67a090e8fdc2dfb71;p=dragonfireclient.git diff --git a/src/map.cpp b/src/map.cpp index 054338c92..35bdc3e9c 100644 --- 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())