aboutsummaryrefslogtreecommitdiff
path: root/src/script/lua_api
diff options
context:
space:
mode:
authorElias Fleckenstein <eliasfleckenstein@web.de>2020-10-18 14:28:17 +0200
committerElias Fleckenstein <eliasfleckenstein@web.de>2020-10-18 14:28:17 +0200
commit151e5782e1f1ed02bb12757c8fe95ca6449b1b89 (patch)
tree1986afbbf0adaa2b2a9dead06ce8c14341e71480 /src/script/lua_api
parent7ed22368606b49bff31f60d2eaadbb96106ea85b (diff)
downloaddragonfireclient-151e5782e1f1ed02bb12757c8fe95ca6449b1b89.tar.xz
Lint is still not happy...
Diffstat (limited to 'src/script/lua_api')
-rw-r--r--src/script/lua_api/l_clientobject.cpp34
1 files changed, 14 insertions, 20 deletions
diff --git a/src/script/lua_api/l_clientobject.cpp b/src/script/lua_api/l_clientobject.cpp
index db3563cc4..2c3b40c55 100644
--- a/src/script/lua_api/l_clientobject.cpp
+++ b/src/script/lua_api/l_clientobject.cpp
@@ -23,16 +23,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "client/client.h"
#include "object_properties.h"
-// should prob do some more NULL checking
-
-
ClientObjectRef *ClientObjectRef::checkobject(lua_State *L, int narg)
{
luaL_checktype(L, narg, LUA_TUSERDATA);
void *userdata = luaL_checkudata(L, narg, className);
if (!userdata)
luaL_typerror(L, narg, className);
- return *(ClientObjectRef**)userdata;
+ return *(ClientObjectRef **)userdata;
}
ClientActiveObject *ClientObjectRef::get_cao(ClientObjectRef *ref)
@@ -136,8 +133,7 @@ int ClientObjectRef::l_get_max_hp(lua_State *L)
return 1;
}
-ClientObjectRef::ClientObjectRef(ClientActiveObject *object):
- m_object(object)
+ClientObjectRef::ClientObjectRef(ClientActiveObject *object) : m_object(object)
{
}
@@ -151,7 +147,8 @@ void ClientObjectRef::create(lua_State *L, ClientActiveObject *object)
}
}
-int ClientObjectRef::gc_object(lua_State *L) {
+int ClientObjectRef::gc_object(lua_State *L)
+{
ClientObjectRef *obj = *(ClientObjectRef **)(lua_touserdata(L, 1));
delete obj;
return 0;
@@ -184,16 +181,13 @@ void ClientObjectRef::Register(lua_State *L)
}
const char ClientObjectRef::className[] = "ClientObjectRef";
-luaL_Reg ClientObjectRef::methods[] = {
- luamethod(ClientObjectRef, get_pos),
- luamethod(ClientObjectRef, get_velocity),
- luamethod(ClientObjectRef, get_acceleration),
- luamethod(ClientObjectRef, get_rotation),
- luamethod(ClientObjectRef, is_player),
- luamethod(ClientObjectRef, get_name),
- luamethod(ClientObjectRef, get_attach),
- luamethod(ClientObjectRef, get_nametag),
- luamethod(ClientObjectRef, get_item_textures),
- luamethod(ClientObjectRef, get_max_hp),
- {0, 0}
-};
+luaL_Reg ClientObjectRef::methods[] = {luamethod(ClientObjectRef, get_pos),
+ luamethod(ClientObjectRef, get_velocity),
+ luamethod(ClientObjectRef, get_acceleration),
+ luamethod(ClientObjectRef, get_rotation),
+ luamethod(ClientObjectRef, is_player),
+ luamethod(ClientObjectRef, get_name),
+ luamethod(ClientObjectRef, get_attach),
+ luamethod(ClientObjectRef, get_nametag),
+ luamethod(ClientObjectRef, get_item_textures),
+ luamethod(ClientObjectRef, get_max_hp), {0, 0}};