summaryrefslogtreecommitdiff
path: root/src/map.cpp
diff options
context:
space:
mode:
authorkwolekr <kwolekr@minetest.net>2015-09-23 00:31:45 -0400
committerkwolekr <kwolekr@minetest.net>2015-09-23 15:56:24 -0400
commitf062bbd7a182233f96c61287d0397534811627d9 (patch)
treedf3d2252f8bbb9975669c7920b57dce2fb3d3df6 /src/map.cpp
parent596484da4fcd301e597a851a9a54b6dc276a286a (diff)
downloadminetest-f062bbd7a182233f96c61287d0397534811627d9.tar.gz
minetest-f062bbd7a182233f96c61287d0397534811627d9.tar.bz2
minetest-f062bbd7a182233f96c61287d0397534811627d9.zip
Add /emergeblocks command and core.emerge_area() Lua API
Diffstat (limited to 'src/map.cpp')
-rw-r--r--src/map.cpp11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/map.cpp b/src/map.cpp
index 76a558d43..fd796734e 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -2259,14 +2259,9 @@ bool ServerMap::initBlockMake(BlockMakeData *data, v3s16 blockpos)
bool enable_mapgen_debug_info = m_emerge->mapgen_debug_info;
EMERGE_DBG_OUT("initBlockMake(): " PP(blockpos) " - " PP(blockpos));
- s16 chunksize = m_emerge->params.chunksize;
- s16 coffset = -chunksize / 2;
- v3s16 chunk_offset(coffset, coffset, coffset);
- v3s16 blockpos_div = getContainerPos(blockpos - chunk_offset, chunksize);
- v3s16 blockpos_min = blockpos_div * chunksize;
- v3s16 blockpos_max = blockpos_div * chunksize + v3s16(1,1,1)*(chunksize-1);
- blockpos_min += chunk_offset;
- blockpos_max += chunk_offset;
+ s16 csize = m_emerge->params.chunksize;
+ v3s16 blockpos_min = EmergeManager::getContainingChunk(blockpos, csize);
+ v3s16 blockpos_max = blockpos_min + v3s16(1, 1, 1) * (csize - 1);
v3s16 extra_borders(1,1,1);