diff options
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/lua_api/l_vmanip.cpp | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/src/script/lua_api/l_vmanip.cpp b/src/script/lua_api/l_vmanip.cpp index f64b94af1..54689c84c 100644 --- a/src/script/lua_api/l_vmanip.cpp +++ b/src/script/lua_api/l_vmanip.cpp @@ -168,10 +168,14 @@ int LuaVoxelManip::l_calc_lighting(lua_State *L) EmergeManager *emerge = getServer(L)->getEmergeManager(); ManualMapVoxelManipulator *vm = o->vm; - v3s16 p1 = lua_istable(L, 2) ? read_v3s16(L, 2) : vm->m_area.MinEdge; - v3s16 p2 = lua_istable(L, 3) ? read_v3s16(L, 3) : vm->m_area.MaxEdge; - sortBoxVerticies(p1, p2); - if (!vm->m_area.contains(VoxelArea(p1, p2))) + v3s16 yblock = v3s16(0, 1, 0) * MAP_BLOCKSIZE; + v3s16 fpmin = vm->m_area.MinEdge; + v3s16 fpmax = vm->m_area.MaxEdge; + v3s16 pmin = lua_istable(L, 2) ? read_v3s16(L, 2) : fpmin + yblock; + v3s16 pmax = lua_istable(L, 3) ? read_v3s16(L, 3) : fpmax - yblock; + + sortBoxVerticies(pmin, pmax); + if (!vm->m_area.contains(VoxelArea(pmin, pmax))) throw LuaError("Specified voxel area out of VoxelManipulator bounds"); Mapgen mg; @@ -179,11 +183,7 @@ int LuaVoxelManip::l_calc_lighting(lua_State *L) mg.ndef = ndef; mg.water_level = emerge->params.water_level; - // Mapgen::calcLighting assumes the coordinates of - // the central chunk; correct for this - mg.calcLighting( - p1 + v3s16(1, 1, 1) * MAP_BLOCKSIZE, - p2 - v3s16(1, 1, 1) * MAP_BLOCKSIZE); + mg.calcLighting(pmin, pmax, fpmin, fpmax); return 0; } @@ -205,19 +205,18 @@ int LuaVoxelManip::l_set_lighting(lua_State *L) ManualMapVoxelManipulator *vm = o->vm; - v3s16 p1 = lua_istable(L, 3) ? read_v3s16(L, 3) : vm->m_area.MinEdge; - v3s16 p2 = lua_istable(L, 4) ? read_v3s16(L, 4) : vm->m_area.MaxEdge; - sortBoxVerticies(p1, p2); - if (!vm->m_area.contains(VoxelArea(p1, p2))) + v3s16 yblock = v3s16(0, 1, 0) * MAP_BLOCKSIZE; + v3s16 pmin = lua_istable(L, 3) ? read_v3s16(L, 3) : vm->m_area.MinEdge + yblock; + v3s16 pmax = lua_istable(L, 4) ? read_v3s16(L, 4) : vm->m_area.MaxEdge - yblock; + + sortBoxVerticies(pmin, pmax); + if (!vm->m_area.contains(VoxelArea(pmin, pmax))) throw LuaError("Specified voxel area out of VoxelManipulator bounds"); Mapgen mg; mg.vm = vm; - mg.setLighting( - p1 + v3s16(0, 1, 0) * MAP_BLOCKSIZE, - p2 - v3s16(0, 1, 0) * MAP_BLOCKSIZE, - light); + mg.setLighting(light, pmin, pmax); return 0; } |