diff options
author | Elias Fleckenstein <eliasfleckenstein@web.de> | 2021-05-13 08:24:07 +0200 |
---|---|---|
committer | Elias Fleckenstein <eliasfleckenstein@web.de> | 2021-05-13 08:24:07 +0200 |
commit | d08242316688ce8ac10dcf94a2cfede21e65be7f (patch) | |
tree | 1acdb762aab226d3618deab4a8c51a6bf2158d71 /src/script/lua_api/l_clientobject.cpp | |
parent | ce0d81a8255886495f5b04ea385b9e37c554db57 (diff) | |
download | dragonfireclient-d08242316688ce8ac10dcf94a2cfede21e65be7f.tar.xz |
Fix format
Diffstat (limited to 'src/script/lua_api/l_clientobject.cpp')
-rw-r--r-- | src/script/lua_api/l_clientobject.cpp | 56 |
1 files changed, 29 insertions, 27 deletions
diff --git a/src/script/lua_api/l_clientobject.cpp b/src/script/lua_api/l_clientobject.cpp index 5a1123169..c093e754e 100644 --- a/src/script/lua_api/l_clientobject.cpp +++ b/src/script/lua_api/l_clientobject.cpp @@ -48,7 +48,7 @@ ClientActiveObject *ClientObjectRef::get_cao(ClientObjectRef *ref) GenericCAO *ClientObjectRef::get_generic_cao(ClientObjectRef *ref, lua_State *L) { ClientActiveObject *obj = get_cao(ref); - if (! obj) + if (!obj) return nullptr; ClientEnvironment &env = getClient(L)->getEnv(); GenericCAO *gcao = env.getGenericCAO(obj->getId()); @@ -59,7 +59,7 @@ int ClientObjectRef::l_get_pos(lua_State *L) { ClientObjectRef *ref = checkobject(L, 1); ClientActiveObject *cao = get_cao(ref); - if (! cao) + if (!cao) return 0; push_v3f(L, cao->getPosition() / BS); return 1; @@ -69,7 +69,7 @@ int ClientObjectRef::l_get_velocity(lua_State *L) { ClientObjectRef *ref = checkobject(L, 1); GenericCAO *gcao = get_generic_cao(ref, L); - if (! gcao) + if (!gcao) return 0; push_v3f(L, gcao->getVelocity() / BS); return 1; @@ -79,7 +79,7 @@ int ClientObjectRef::l_get_acceleration(lua_State *L) { ClientObjectRef *ref = checkobject(L, 1); GenericCAO *gcao = get_generic_cao(ref, L); - if (! gcao) + if (!gcao) return 0; push_v3f(L, gcao->getAcceleration() / BS); return 1; @@ -89,7 +89,7 @@ int ClientObjectRef::l_get_rotation(lua_State *L) { ClientObjectRef *ref = checkobject(L, 1); GenericCAO *gcao = get_generic_cao(ref, L); - if (! gcao) + if (!gcao) return 0; push_v3f(L, gcao->getRotation()); return 1; @@ -99,7 +99,7 @@ int ClientObjectRef::l_is_player(lua_State *L) { ClientObjectRef *ref = checkobject(L, 1); GenericCAO *gcao = get_generic_cao(ref, L); - if (! gcao) + if (!gcao) return 0; lua_pushboolean(L, gcao->isPlayer()); return 1; @@ -109,7 +109,7 @@ int ClientObjectRef::l_is_local_player(lua_State *L) { ClientObjectRef *ref = checkobject(L, 1); GenericCAO *gcao = get_generic_cao(ref, L); - if (! gcao) + if (!gcao) return 0; lua_pushboolean(L, gcao->isLocalPlayer()); return 1; @@ -119,7 +119,7 @@ int ClientObjectRef::l_get_name(lua_State *L) { ClientObjectRef *ref = checkobject(L, 1); GenericCAO *gcao = get_generic_cao(ref, L); - if (! gcao) + if (!gcao) return 0; lua_pushstring(L, gcao->getName().c_str()); return 1; @@ -129,10 +129,10 @@ int ClientObjectRef::l_get_attach(lua_State *L) { ClientObjectRef *ref = checkobject(L, 1); GenericCAO *gcao = get_generic_cao(ref, L); - if (! gcao) + if (!gcao) return 0; ClientActiveObject *parent = gcao->getParent(); - if (! parent) + if (!parent) return 0; push_objectRef(L, parent->getId()); return 1; @@ -140,10 +140,11 @@ int ClientObjectRef::l_get_attach(lua_State *L) int ClientObjectRef::l_get_nametag(lua_State *L) { - log_deprecated(L,"Deprecated call to get_nametag, use get_properties().nametag instead"); + log_deprecated(L, "Deprecated call to get_nametag, use get_properties().nametag " + "instead"); ClientObjectRef *ref = checkobject(L, 1); GenericCAO *gcao = get_generic_cao(ref, L); - if (! gcao) + if (!gcao) return 0; ObjectProperties *props = gcao->getProperties(); lua_pushstring(L, props->nametag.c_str()); @@ -152,10 +153,11 @@ int ClientObjectRef::l_get_nametag(lua_State *L) int ClientObjectRef::l_get_item_textures(lua_State *L) { - log_deprecated(L,"Deprecated call to get_item_textures, use get_properties().textures instead"); + log_deprecated(L, "Deprecated call to get_item_textures, use " + "get_properties().textures instead"); ClientObjectRef *ref = checkobject(L, 1); GenericCAO *gcao = get_generic_cao(ref, L); - if (! gcao) + if (!gcao) return 0; ObjectProperties *props = gcao->getProperties(); lua_newtable(L); @@ -168,10 +170,11 @@ int ClientObjectRef::l_get_item_textures(lua_State *L) int ClientObjectRef::l_get_max_hp(lua_State *L) { - log_deprecated(L,"Deprecated call to get_max_hp, use get_properties().hp_max instead"); + log_deprecated(L, "Deprecated call to get_max_hp, use get_properties().hp_max " + "instead"); ClientObjectRef *ref = checkobject(L, 1); GenericCAO *gcao = get_generic_cao(ref, L); - if (! gcao) + if (!gcao) return 0; ObjectProperties *props = gcao->getProperties(); lua_pushnumber(L, props->hp_max); @@ -182,7 +185,7 @@ int ClientObjectRef::l_get_properties(lua_State *L) { ClientObjectRef *ref = checkobject(L, 1); GenericCAO *gcao = get_generic_cao(ref, L); - if (! gcao) + if (!gcao) return 0; ObjectProperties *prop = gcao->getProperties(); push_object_properties(L, prop); @@ -193,7 +196,7 @@ int ClientObjectRef::l_set_properties(lua_State *L) { ClientObjectRef *ref = checkobject(L, 1); GenericCAO *gcao = get_generic_cao(ref, L); - if (! gcao) + if (!gcao) return 0; ObjectProperties prop = *gcao->getProperties(); read_object_properties(L, 2, nullptr, &prop, getClient(L)->idef()); @@ -205,7 +208,7 @@ int ClientObjectRef::l_get_hp(lua_State *L) { ClientObjectRef *ref = checkobject(L, 1); GenericCAO *gcao = get_generic_cao(ref, L); - if (! gcao) + if (!gcao) return 0; lua_pushnumber(L, gcao->getHp()); return 1; @@ -215,7 +218,7 @@ int ClientObjectRef::l_punch(lua_State *L) { ClientObjectRef *ref = checkobject(L, 1); GenericCAO *gcao = get_generic_cao(ref, L); - if (! gcao) + if (!gcao) return 0; PointedThing pointed(gcao->getId(), v3f(0, 0, 0), v3s16(0, 0, 0), 0); getClient(L)->interact(INTERACT_START_DIGGING, pointed); @@ -226,7 +229,7 @@ int ClientObjectRef::l_rightclick(lua_State *L) { ClientObjectRef *ref = checkobject(L, 1); GenericCAO *gcao = get_generic_cao(ref, L); - if (! gcao) + if (!gcao) return 0; PointedThing pointed(gcao->getId(), v3f(0, 0, 0), v3s16(0, 0, 0), 0); getClient(L)->interact(INTERACT_PLACE, pointed); @@ -237,7 +240,7 @@ int ClientObjectRef::l_remove(lua_State *L) { ClientObjectRef *ref = checkobject(L, 1); ClientActiveObject *cao = get_cao(ref); - if (! cao) + if (!cao) return 0; getClient(L)->getEnv().removeActiveObject(cao->getId()); @@ -248,12 +251,12 @@ int ClientObjectRef::l_set_nametag_images(lua_State *L) { ClientObjectRef *ref = checkobject(L, 1); GenericCAO *gcao = get_generic_cao(ref, L); - if (! gcao) + if (!gcao) return 0; gcao->nametag_images.clear(); - if(lua_istable(L, 2)){ + if (lua_istable(L, 2)) { lua_pushnil(L); - while(lua_next(L, 2) != 0){ + while (lua_next(L, 2) != 0) { gcao->nametag_images.push_back(lua_tostring(L, -1)); lua_pop(L, 1); } @@ -333,7 +336,6 @@ luaL_Reg ClientObjectRef::methods[] = {luamethod(ClientObjectRef, get_pos), luamethod(ClientObjectRef, get_properties), luamethod(ClientObjectRef, set_properties), luamethod(ClientObjectRef, get_hp), - luamethod(ClientObjectRef, get_max_hp), - luamethod(ClientObjectRef, punch), + luamethod(ClientObjectRef, get_max_hp), luamethod(ClientObjectRef, punch), luamethod(ClientObjectRef, rightclick), luamethod(ClientObjectRef, set_nametag_images), {0, 0}}; |