luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-13 16:45:20 +02:00
Code Activity

Split liquid_viscosity to liquid_viscosity and move_resistance (#10810)

Browse Source
This commit is contained in:
Wuzzy
2021-10-01 14:21:24 +00:00
committed by GitHub
parent f5040707fe
commit 21113ad410
15 changed files with 288 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/script/lua_api/l_localplayer.cpp
View File

@@ -128,11 +128,11 @@ int LuaLocalPlayer::l_is_in_liquid_stable(lua_State *L)
return 1;
}
int LuaLocalPlayer::l_get_liquid_viscosity(lua_State *L)
int LuaLocalPlayer::l_get_move_resistance(lua_State *L)
{
LocalPlayer *player = getobject(L, 1);
lua_pushinteger(L, player->liquid_viscosity);
lua_pushinteger(L, player->move_resistance);
return 1;
}
@@ -466,7 +466,6 @@ const luaL_Reg LuaLocalPlayer::methods[] = {
luamethod(LuaLocalPlayer, is_touching_ground),
luamethod(LuaLocalPlayer, is_in_liquid),
luamethod(LuaLocalPlayer, is_in_liquid_stable),
luamethod(LuaLocalPlayer, get_liquid_viscosity),
luamethod(LuaLocalPlayer, is_climbing),
luamethod(LuaLocalPlayer, swimming_vertical),
luamethod(LuaLocalPlayer, get_physics_override),
@@ -488,5 +487,7 @@ const luaL_Reg LuaLocalPlayer::methods[] = {
luamethod(LuaLocalPlayer, hud_change),
luamethod(LuaLocalPlayer, hud_get),
luamethod(LuaLocalPlayer, get_move_resistance),
{0, 0}
};

3
src/script/lua_api/l_localplayer.h
View File

@@ -51,7 +51,6 @@ private:
static int l_is_touching_ground(lua_State *L);
static int l_is_in_liquid(lua_State *L);
static int l_is_in_liquid_stable(lua_State *L);
static int l_get_liquid_viscosity(lua_State *L);
static int l_is_climbing(lua_State *L);
static int l_swimming_vertical(lua_State *L);
@@ -96,6 +95,8 @@ private:
// hud_get(self, id)
static int l_hud_get(lua_State *L);
static int l_get_move_resistance(lua_State *L);
LocalPlayer *m_localplayer = nullptr;
public: