diff options
author | Elias Fleckenstein <54945686+EliasFleckenstein03@users.noreply.github.com> | 2020-11-04 16:57:47 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-04 16:57:47 +0100 |
commit | 3e16c3a78fff61c20e63ba730d15e94e3bb877b4 (patch) | |
tree | c070350db219f2c4241d22bc31949685c7b42fe9 /src/script/lua_api/l_object.h | |
parent | 5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc (diff) | |
parent | 6ccb5835ff55d85156be91473c598eca9d6cb9a6 (diff) | |
download | dragonfireclient-3e16c3a78fff61c20e63ba730d15e94e3bb877b4.tar.xz |
Merge branch 'master' into master
Diffstat (limited to 'src/script/lua_api/l_object.h')
-rw-r--r-- | src/script/lua_api/l_object.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/script/lua_api/l_object.h b/src/script/lua_api/l_object.h index a7b52bdb3..a75c59fd9 100644 --- a/src/script/lua_api/l_object.h +++ b/src/script/lua_api/l_object.h @@ -31,8 +31,7 @@ class RemotePlayer; ObjectRef */ -class ObjectRef : public ModApiBase -{ +class ObjectRef : public ModApiBase { public: ObjectRef(ServerActiveObject *object); @@ -48,16 +47,16 @@ public: static ObjectRef *checkobject(lua_State *L, int narg); - static ServerActiveObject *getobject(ObjectRef *ref); - + static ServerActiveObject* getobject(ObjectRef *ref); private: ServerActiveObject *m_object = nullptr; static const char className[]; static luaL_Reg methods[]; - static LuaEntitySAO *getluaobject(ObjectRef *ref); - static PlayerSAO *getplayersao(ObjectRef *ref); + static LuaEntitySAO* getluaobject(ObjectRef *ref); + + static PlayerSAO* getplayersao(ObjectRef *ref); static RemotePlayer *getplayer(ObjectRef *ref); @@ -332,7 +331,7 @@ private: static int l_get_sky(lua_State *L); // get_sky_color(self) - static int l_get_sky_color(lua_State *L); + static int l_get_sky_color(lua_State* L); // set_sun(self, {visible, texture=, tonemap=, sunrise=, rotation=, scale=}) static int l_set_sun(lua_State *L); |