diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 27a35b4f962d646fa8c907e30826163100ef802d..3ee68b4b6a130cab04e7a13cbcee2ab66e1cc5f8 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -1563,13 +1563,11 @@ methods:
- update_map(): Update map after writing chunk back to map.
^ To be used only by VoxelManip objects created by the mod itself; not a VoxelManip that was
^ retrieved from minetest.get_mapgen_object
-- set_lighting(p1, p2, light): Set the lighting in the region formed by p1 and p2 to light
- ^ light is a table containing two integer fields ranging from 0 to 15, day and night
- ^ To be used only by a VoxelManip object from minetest.get_mapgen_object; otherwise, set lighting will
- ^ be ignored
-- calc_lighting(p1, p2): Calculate lighting in the region formed by p1 and p2
- ^ To be used only by a VoxelManip object from minetest.get_mapgen_object; otherwise, calculated lighting
- ^ will be ignored
+- set_lighting(light): Set the lighting within the VoxelManip
+ ^ light is a table, {day=<0...15>, night=<0...15>}
+ ^ To be used only by a VoxelManip object from minetest.get_mapgen_object
+- calc_lighting(): Calculate lighting within the VoxelManip
+ ^ To be used only by a VoxelManip object from minetest.get_mapgen_object
- update_liquids(): Update liquid flow
VoxelArea: A helper class for voxel areas
diff --git a/src/script/lua_api/l_env.cpp b/src/script/lua_api/l_env.cpp
index 89ba9798a8fe21e3420bf9a19f50043131edc434..1cbf34ab95f54b70a0c25f3f224b0bd98048b926 100644
--- a/src/script/lua_api/l_env.cpp
+++ b/src/script/lua_api/l_env.cpp
@@ -591,7 +591,7 @@ int ModApiEnvMod::l_get_mapgen_object(lua_State *L)
ManualMapVoxelManipulator *vm = mg->vm;
// VoxelManip object
- LuaVoxelManip *o = new LuaVoxelManip(vm, false);
+ LuaVoxelManip *o = new LuaVoxelManip(vm, true);
*(void **)(lua_newuserdata(L, sizeof(void *))) = o;
luaL_getmetatable(L, "VoxelManip");
lua_setmetatable(L, -2);
diff --git a/src/script/lua_api/l_vmanip.cpp b/src/script/lua_api/l_vmanip.cpp
index 8bf65a5557d224f417e18541f78a20529ec79147..50a48e89b6d4b915f173b97d4d75ddd6f7623028 100644
--- a/src/script/lua_api/l_vmanip.cpp
+++ b/src/script/lua_api/l_vmanip.cpp
@@ -33,7 +33,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
int LuaVoxelManip::gc_object(lua_State *L)
{
LuaVoxelManip *o = *(LuaVoxelManip **)(lua_touserdata(L, 1));
- if (o->do_gc)
+ if (!o->is_mapgen_vm)
delete o;
return 0;
@@ -111,10 +111,12 @@ int LuaVoxelManip::l_write_to_map(lua_State *L)
int LuaVoxelManip::l_update_liquids(lua_State *L)
{
LuaVoxelManip *o = checkobject(L, 1);
+ if (!o->is_mapgen_vm)
+ return 0;
- ManualMapVoxelManipulator *vm = o->vm;
INodeDefManager *ndef = STACK_TO_SERVER(L)->getNodeDefManager();
Map *map = &(get_scriptapi(L)->getEnv()->getMap());
+ ManualMapVoxelManipulator *vm = o->vm;
Mapgen mg;
mg.vm = vm;
@@ -131,20 +133,20 @@ int LuaVoxelManip::l_calc_lighting(lua_State *L)
NO_MAP_LOCK_REQUIRED;
LuaVoxelManip *o = checkobject(L, 1);
- v3s16 p1 = read_v3s16(L, 2);
- v3s16 p2 = read_v3s16(L, 3);
- sortBoxVerticies(p1, p2);
-
- ManualMapVoxelManipulator *vm = o->vm;
+ if (!o->is_mapgen_vm)
+ return 0;
+
INodeDefManager *ndef = STACK_TO_SERVER(L)->getNodeDefManager();
EmergeManager *emerge = STACK_TO_SERVER(L)->getEmergeManager();
-
+ ManualMapVoxelManipulator *vm = o->vm;
+
Mapgen mg;
mg.vm = vm;
mg.ndef = ndef;
mg.water_level = emerge->params->water_level;
- mg.calcLighting(p1, p2);
+ mg.calcLighting(vm->m_area.MinEdge + v3s16(0, 1, 0) * MAP_BLOCKSIZE,
+ vm->m_area.MaxEdge - v3s16(0, 1, 0) * MAP_BLOCKSIZE);
return 0;
}
@@ -154,23 +156,24 @@ int LuaVoxelManip::l_set_lighting(lua_State *L)
NO_MAP_LOCK_REQUIRED;
LuaVoxelManip *o = checkobject(L, 1);
- v3s16 p1 = read_v3s16(L, 2);
- v3s16 p2 = read_v3s16(L, 3);
- sortBoxVerticies(p1, p2);
+ if (!o->is_mapgen_vm)
+ return 0;
- u8 light;
- if (!lua_istable(L, 4))
+ if (!lua_istable(L, 2))
return 0;
- light = getintfield_default(L, 4, "day", 0);
- light |= getintfield_default(L, 4, "night", 0);
+ u8 light;
+ light = (getintfield_default(L, 4, "day", 0) & 0x0F);
+ light |= (getintfield_default(L, 4, "night", 0) & 0x0F) << 8;
ManualMapVoxelManipulator *vm = o->vm;
Mapgen mg;
mg.vm = vm;
- mg.setLighting(p1, p2, light);
+ mg.setLighting(vm->m_area.MinEdge + v3s16(0, 1, 0) * MAP_BLOCKSIZE,
+ vm->m_area.MaxEdge - v3s16(0, 1, 0) * MAP_BLOCKSIZE,
+ light);
return 0;
}
@@ -178,6 +181,8 @@ int LuaVoxelManip::l_set_lighting(lua_State *L)
int LuaVoxelManip::l_update_map(lua_State *L)
{
LuaVoxelManip *o = checkobject(L, 1);
+ if (o->is_mapgen_vm)
+ return 0;
// TODO: Optimize this by using Mapgen::calcLighting() instead
std::map<v3s16, MapBlock *> lighting_mblocks;
@@ -202,15 +207,16 @@ int LuaVoxelManip::l_update_map(lua_State *L)
return 0;
}
-LuaVoxelManip::LuaVoxelManip(ManualMapVoxelManipulator *mmvm, bool dogc)
+LuaVoxelManip::LuaVoxelManip(ManualMapVoxelManipulator *mmvm, bool is_mg_vm)
{
- this->vm = mmvm;
- this->do_gc = dogc;
+ this->vm = mmvm;
+ this->is_mapgen_vm = is_mg_vm;
}
LuaVoxelManip::LuaVoxelManip(Map *map)
{
- vm = new ManualMapVoxelManipulator(map);
+ this->vm = new ManualMapVoxelManipulator(map);
+ this->is_mapgen_vm = false;
}
LuaVoxelManip::~LuaVoxelManip()
diff --git a/src/script/lua_api/l_vmanip.h b/src/script/lua_api/l_vmanip.h
index 7720ec040004fa73792275016de7a16097fdaaf8..a7791e56badac4f330b2d20d0364de689e8c3eb1 100644
--- a/src/script/lua_api/l_vmanip.h
+++ b/src/script/lua_api/l_vmanip.h
@@ -36,7 +36,7 @@ class LuaVoxelManip
private:
ManualMapVoxelManipulator *vm;
std::map<v3s16, MapBlock *> modified_blocks;
- bool do_gc;
+ bool is_mapgen_vm;
static const char className[];
static const luaL_reg methods[];
@@ -54,7 +54,7 @@ class LuaVoxelManip
static int l_set_lighting(lua_State *L);
public:
- LuaVoxelManip(ManualMapVoxelManipulator *mmvm, bool dogc);
+ LuaVoxelManip(ManualMapVoxelManipulator *mmvm, bool is_mapgen_vm);
LuaVoxelManip(Map *map);
~LuaVoxelManip();