minetest-stuffs/dragonfire-client-dragonfire
minetest-stuffs/dragonfire-client-dragonfire
1
0
Fork 0
Code Issues 10 Pull Requests 2 Packages Projects Releases 3 Wiki Activity

Lint is still not happy...

Browse Source
This commit is contained in:
Elias Fleckenstein 2020-10-18 14:28:17 +02:00
parent 7ed2236860
commit 151e5782e1
2 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/script/cpp_api/s_cheats.cpp
View File

@ -29,7 +29,6 @@ ScriptApiCheatsCheat::ScriptApiCheatsCheat(
{
}
ScriptApiCheatsCheat::ScriptApiCheatsCheat(const std::string &name, const int &function) :
m_name(name), m_setting(""), m_function_ref(function)
{

34
src/script/lua_api/l_clientobject.cpp
View File

@ -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}};