Oblomov
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

LuaVoxelManip: Throw warning or error instead of silently doing nothing (#7567) 

Error on missing parameter.
Warning when using a method on the incorrect type of LuaVoxelManip.
master
HybridDog 2018-08-02 20:54:44 +02:00 committed by Paramat
parent 6afbb06c7e
commit 741e3efaf5
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/script/lua_api/l_vmanip.cpp
View File

@ -91,7 +91,7 @@ int LuaVoxelManip::l_set_data(lua_State *L)
MMVManip *vm = o->vm; MMVManip *vm = o->vm;
if (!lua_istable(L, 2)) if (!lua_istable(L, 2))
return 0; throw LuaError("VoxelManip:set_data called with missing parameter");
u32 volume = vm->m_area.getVolume(); u32 volume = vm->m_area.getVolume();
for (u32 i = 0; i != volume; i++) { for (u32 i = 0; i != volume; i++) {
@ -185,8 +185,11 @@ int LuaVoxelManip::l_calc_lighting(lua_State *L)
NO_MAP_LOCK_REQUIRED; NO_MAP_LOCK_REQUIRED;
LuaVoxelManip *o = checkobject(L, 1); LuaVoxelManip *o = checkobject(L, 1);
if (!o->is_mapgen_vm) if (!o->is_mapgen_vm) {
warningstream << "VoxelManip:calc_lighting called for a non-mapgen "
"VoxelManip object" << std::endl;
return 0; return 0;
}
const NodeDefManager *ndef = getServer(L)->getNodeDefManager(); const NodeDefManager *ndef = getServer(L)->getNodeDefManager();
EmergeManager *emerge = getServer(L)->getEmergeManager(); EmergeManager *emerge = getServer(L)->getEmergeManager();
@ -218,11 +221,14 @@ int LuaVoxelManip::l_set_lighting(lua_State *L)
NO_MAP_LOCK_REQUIRED; NO_MAP_LOCK_REQUIRED;
LuaVoxelManip *o = checkobject(L, 1); LuaVoxelManip *o = checkobject(L, 1);
if (!o->is_mapgen_vm) if (!o->is_mapgen_vm) {
warningstream << "VoxelManip:set_lighting called for a non-mapgen "
"VoxelManip object" << std::endl;
return 0; return 0;
}
if (!lua_istable(L, 2)) if (!lua_istable(L, 2))
return 0; throw LuaError("VoxelManip:set_lighting called with missing parameter");
u8 light; u8 light;
light = (getintfield_default(L, 2, "day", 0) & 0x0F); light = (getintfield_default(L, 2, "day", 0) & 0x0F);
@ -273,7 +279,8 @@ int LuaVoxelManip::l_set_light_data(lua_State *L)
MMVManip *vm = o->vm; MMVManip *vm = o->vm;
if (!lua_istable(L, 2)) if (!lua_istable(L, 2))
return 0; throw LuaError("VoxelManip:set_light_data called with missing "
"parameter");
u32 volume = vm->m_area.getVolume(); u32 volume = vm->m_area.getVolume();
for (u32 i = 0; i != volume; i++) { for (u32 i = 0; i != volume; i++) {
@ -321,7 +328,8 @@ int LuaVoxelManip::l_set_param2_data(lua_State *L)
MMVManip *vm = o->vm; MMVManip *vm = o->vm;
if (!lua_istable(L, 2)) if (!lua_istable(L, 2))
return 0; throw LuaError("VoxelManip:set_param2_data called with missing "
"parameter");
u32 volume = vm->m_area.getVolume(); u32 volume = vm->m_area.getVolume();
for (u32 i = 0; i != volume; i++) { for (u32 i = 0; i != volume; i++) {