aboutsummaryrefslogtreecommitdiff
path: root/src/script/lua_api/l_vmanip.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/script/lua_api/l_vmanip.cpp')
-rw-r--r--src/script/lua_api/l_vmanip.cpp98
1 files changed, 51 insertions, 47 deletions
diff --git a/src/script/lua_api/l_vmanip.cpp b/src/script/lua_api/l_vmanip.cpp
index 17fb830f9..b99b1d98c 100644
--- a/src/script/lua_api/l_vmanip.cpp
+++ b/src/script/lua_api/l_vmanip.cpp
@@ -17,6 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
+
#include "lua_api/l_vmanip.h"
#include "lua_api/l_internal.h"
#include "common/c_content.h"
@@ -62,7 +63,7 @@ int LuaVoxelManip::l_get_data(lua_State *L)
NO_MAP_LOCK_REQUIRED;
LuaVoxelManip *o = checkobject(L, 1);
- bool use_buffer = lua_istable(L, 2);
+ bool use_buffer = lua_istable(L, 2);
MMVManip *vm = o->vm;
@@ -116,7 +117,8 @@ int LuaVoxelManip::l_write_to_map(lua_State *L)
if (o->is_mapgen_vm || !update_light) {
o->vm->blitBackAll(&(o->modified_blocks));
} else {
- voxalgo::blit_back_with_light(map, o->vm, &(o->modified_blocks));
+ voxalgo::blit_back_with_light(map, o->vm,
+ &(o->modified_blocks));
}
MapEditEvent event;
@@ -137,7 +139,7 @@ int LuaVoxelManip::l_get_node_at(lua_State *L)
const NodeDefManager *ndef = getServer(L)->getNodeDefManager();
LuaVoxelManip *o = checkobject(L, 1);
- v3s16 pos = check_v3s16(L, 2);
+ v3s16 pos = check_v3s16(L, 2);
pushnode(L, o->vm->getNodeNoExNoEmerge(pos), ndef);
return 1;
@@ -150,8 +152,8 @@ int LuaVoxelManip::l_set_node_at(lua_State *L)
const NodeDefManager *ndef = getServer(L)->getNodeDefManager();
LuaVoxelManip *o = checkobject(L, 1);
- v3s16 pos = check_v3s16(L, 2);
- MapNode n = readnode(L, 3, ndef);
+ v3s16 pos = check_v3s16(L, 2);
+ MapNode n = readnode(L, 3, ndef);
o->vm->setNodeNoEmerge(pos, n);
@@ -169,11 +171,11 @@ int LuaVoxelManip::l_update_liquids(lua_State *L)
MMVManip *vm = o->vm;
Mapgen mg;
- mg.vm = vm;
+ mg.vm = vm;
mg.ndef = ndef;
- mg.updateLiquid(&map->m_transforming_liquid, vm->m_area.MinEdge,
- vm->m_area.MaxEdge);
+ mg.updateLiquid(&map->m_transforming_liquid,
+ vm->m_area.MinEdge, vm->m_area.MaxEdge);
return 0;
}
@@ -185,8 +187,7 @@ int LuaVoxelManip::l_calc_lighting(lua_State *L)
LuaVoxelManip *o = checkobject(L, 1);
if (!o->is_mapgen_vm) {
warningstream << "VoxelManip:calc_lighting called for a non-mapgen "
- "VoxelManip object"
- << std::endl;
+ "VoxelManip object" << std::endl;
return 0;
}
@@ -195,10 +196,10 @@ int LuaVoxelManip::l_calc_lighting(lua_State *L)
MMVManip *vm = o->vm;
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) ? check_v3s16(L, 2) : fpmin + yblock;
- v3s16 pmax = lua_istable(L, 3) ? check_v3s16(L, 3) : fpmax - yblock;
+ v3s16 fpmin = vm->m_area.MinEdge;
+ v3s16 fpmax = vm->m_area.MaxEdge;
+ v3s16 pmin = lua_istable(L, 2) ? check_v3s16(L, 2) : fpmin + yblock;
+ v3s16 pmax = lua_istable(L, 3) ? check_v3s16(L, 3) : fpmax - yblock;
bool propagate_shadow = !lua_isboolean(L, 4) || readParam<bool>(L, 4);
sortBoxVerticies(pmin, pmax);
@@ -206,8 +207,8 @@ int LuaVoxelManip::l_calc_lighting(lua_State *L)
throw LuaError("Specified voxel area out of VoxelManipulator bounds");
Mapgen mg;
- mg.vm = vm;
- mg.ndef = ndef;
+ mg.vm = vm;
+ mg.ndef = ndef;
mg.water_level = emerge->mgparams->water_level;
mg.calcLighting(pmin, pmax, fpmin, fpmax, propagate_shadow);
@@ -222,8 +223,7 @@ int LuaVoxelManip::l_set_lighting(lua_State *L)
LuaVoxelManip *o = checkobject(L, 1);
if (!o->is_mapgen_vm) {
warningstream << "VoxelManip:set_lighting called for a non-mapgen "
- "VoxelManip object"
- << std::endl;
+ "VoxelManip object" << std::endl;
return 0;
}
@@ -231,7 +231,7 @@ int LuaVoxelManip::l_set_lighting(lua_State *L)
throw LuaError("VoxelManip:set_lighting called with missing parameter");
u8 light;
- light = (getintfield_default(L, 2, "day", 0) & 0x0F);
+ light = (getintfield_default(L, 2, "day", 0) & 0x0F);
light |= (getintfield_default(L, 2, "night", 0) & 0x0F) << 4;
MMVManip *vm = o->vm;
@@ -280,7 +280,7 @@ int LuaVoxelManip::l_set_light_data(lua_State *L)
if (!lua_istable(L, 2))
throw LuaError("VoxelManip:set_light_data called with missing "
- "parameter");
+ "parameter");
u32 volume = vm->m_area.getVolume();
for (u32 i = 0; i != volume; i++) {
@@ -300,7 +300,7 @@ int LuaVoxelManip::l_get_param2_data(lua_State *L)
NO_MAP_LOCK_REQUIRED;
LuaVoxelManip *o = checkobject(L, 1);
- bool use_buffer = lua_istable(L, 2);
+ bool use_buffer = lua_istable(L, 2);
MMVManip *vm = o->vm;
@@ -329,7 +329,7 @@ int LuaVoxelManip::l_set_param2_data(lua_State *L)
if (!lua_istable(L, 2))
throw LuaError("VoxelManip:set_param2_data called with missing "
- "parameter");
+ "parameter");
u32 volume = vm->m_area.getVolume();
for (u32 i = 0; i != volume; i++) {
@@ -374,7 +374,8 @@ int LuaVoxelManip::l_get_emerged_area(lua_State *L)
}
LuaVoxelManip::LuaVoxelManip(MMVManip *mmvm, bool is_mg_vm) :
- is_mapgen_vm(is_mg_vm), vm(mmvm)
+ is_mapgen_vm(is_mg_vm),
+ vm(mmvm)
{
}
@@ -405,10 +406,9 @@ int LuaVoxelManip::create_object(lua_State *L)
GET_ENV_PTR;
Map *map = &(env->getMap());
- LuaVoxelManip *o = (lua_istable(L, 1) && lua_istable(L, 2))
- ? new LuaVoxelManip(map, check_v3s16(L, 1),
- check_v3s16(L, 2))
- : new LuaVoxelManip(map);
+ LuaVoxelManip *o = (lua_istable(L, 1) && lua_istable(L, 2)) ?
+ new LuaVoxelManip(map, check_v3s16(L, 1), check_v3s16(L, 2)) :
+ new LuaVoxelManip(map);
*(void **)(lua_newuserdata(L, sizeof(void *))) = o;
luaL_getmetatable(L, className);
@@ -426,7 +426,7 @@ LuaVoxelManip *LuaVoxelManip::checkobject(lua_State *L, int narg)
if (!ud)
luaL_typerror(L, narg, className);
- return *(LuaVoxelManip **)ud; // unbox pointer
+ return *(LuaVoxelManip **)ud; // unbox pointer
}
void LuaVoxelManip::Register(lua_State *L)
@@ -438,7 +438,7 @@ void LuaVoxelManip::Register(lua_State *L)
lua_pushliteral(L, "__metatable");
lua_pushvalue(L, methodtable);
- lua_settable(L, metatable); // hide metatable from Lua getmetatable()
+ lua_settable(L, metatable); // hide metatable from Lua getmetatable()
lua_pushliteral(L, "__index");
lua_pushvalue(L, methodtable);
@@ -448,28 +448,32 @@ void LuaVoxelManip::Register(lua_State *L)
lua_pushcfunction(L, gc_object);
lua_settable(L, metatable);
- lua_pop(L, 1); // drop metatable
+ lua_pop(L, 1); // drop metatable
- luaL_openlib(L, 0, methods, 0); // fill methodtable
- lua_pop(L, 1); // drop methodtable
+ luaL_openlib(L, 0, methods, 0); // fill methodtable
+ lua_pop(L, 1); // drop methodtable
// Can be created from Lua (VoxelManip())
lua_register(L, className, create_object);
}
const char LuaVoxelManip::className[] = "VoxelManip";
-const luaL_Reg LuaVoxelManip::methods[] = {luamethod(LuaVoxelManip, read_from_map),
- luamethod(LuaVoxelManip, get_data), luamethod(LuaVoxelManip, set_data),
- luamethod(LuaVoxelManip, get_node_at),
- luamethod(LuaVoxelManip, set_node_at),
- luamethod(LuaVoxelManip, write_to_map),
- luamethod(LuaVoxelManip, update_map),
- luamethod(LuaVoxelManip, update_liquids),
- luamethod(LuaVoxelManip, calc_lighting),
- luamethod(LuaVoxelManip, set_lighting),
- luamethod(LuaVoxelManip, get_light_data),
- luamethod(LuaVoxelManip, set_light_data),
- luamethod(LuaVoxelManip, get_param2_data),
- luamethod(LuaVoxelManip, set_param2_data),
- luamethod(LuaVoxelManip, was_modified),
- luamethod(LuaVoxelManip, get_emerged_area), {0, 0}};
+const luaL_Reg LuaVoxelManip::methods[] = {
+ luamethod(LuaVoxelManip, read_from_map),
+ luamethod(LuaVoxelManip, get_data),
+ luamethod(LuaVoxelManip, set_data),
+ luamethod(LuaVoxelManip, get_node_at),
+ luamethod(LuaVoxelManip, set_node_at),
+ luamethod(LuaVoxelManip, write_to_map),
+ luamethod(LuaVoxelManip, update_map),
+ luamethod(LuaVoxelManip, update_liquids),
+ luamethod(LuaVoxelManip, calc_lighting),
+ luamethod(LuaVoxelManip, set_lighting),
+ luamethod(LuaVoxelManip, get_light_data),
+ luamethod(LuaVoxelManip, set_light_data),
+ luamethod(LuaVoxelManip, get_param2_data),
+ luamethod(LuaVoxelManip, set_param2_data),
+ luamethod(LuaVoxelManip, was_modified),
+ luamethod(LuaVoxelManip, get_emerged_area),
+ {0,0}
+};