diff --git a/src/d_player.h b/src/d_player.h index b828778cd..bb22235b7 100644 --- a/src/d_player.h +++ b/src/d_player.h @@ -465,7 +465,6 @@ struct player_t angle_t viewrollangle; // camera tilt - // TODO: expose to lua angle_t tilt; angle_t angleturn; diff --git a/src/lua_playerlib.c b/src/lua_playerlib.c index 5e24f9aba..4e7b7cff1 100644 --- a/src/lua_playerlib.c +++ b/src/lua_playerlib.c @@ -244,7 +244,9 @@ enum player_e player_health, player_viewz, player_viewheight, + player_cameraOffset, player_viewrollangle, + player_tilt, player_aiming, player_drawangle, player_frameangle, @@ -454,7 +456,9 @@ static const char *const player_opt[] = { "health", "viewz", "viewheight", + "cameraOffset", "viewrollangle", + "tilt", "aiming", "drawangle", "frameangle", @@ -710,9 +714,15 @@ static int player_get(lua_State *L) case player_viewheight: lua_pushfixed(L, plr->viewheight); break; + case player_cameraOffset: + lua_pushfixed(L, plr->cameraOffset); + break; case player_viewrollangle: lua_pushangle(L, plr->viewrollangle); break; + case player_tilt: + lua_pushangle(L, plr->tilt); + break; case player_aiming: lua_pushangle(L, plr->aiming); break; @@ -1387,9 +1397,15 @@ static int player_set(lua_State *L) case player_viewheight: plr->viewheight = luaL_checkfixed(L, 3); break; + case player_cameraOffset: + plr->cameraOffset = luaL_checkfixed(L, 3); + break; case player_viewrollangle: plr->viewrollangle = luaL_checkangle(L, 3); break; + case player_tilt: + plr->tilt = luaL_checkangle(L, 3); + break; case player_aiming: { UINT8 i; @@ -2618,7 +2634,7 @@ static int kartstuff_set(lua_State *L) break; case k_justbumped: plr->justbumped = i; - break;; + break; case k_comebacktimer: plr->karmadelay = i; break;