diff --git a/src/k_kart.c b/src/k_kart.c index c58d43d0f..a54fa5388 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -5984,6 +5984,7 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd) player->mo->z + (player->mo->height/2) + (P_RandomRange(-20,20) * player->mo->scale), MT_FASTLINE); + P_SetTarget(&fast->target, player->mo); fast->angle = R_PointToAngle2(0, 0, player->mo->momx, player->mo->momy); fast->momx = 3*player->mo->momx/4; fast->momy = 3*player->mo->momy/4; diff --git a/src/lua_playerlib.c b/src/lua_playerlib.c index d9766513b..356cdd329 100644 --- a/src/lua_playerlib.c +++ b/src/lua_playerlib.c @@ -17,6 +17,7 @@ #include "d_player.h" #include "g_game.h" #include "p_local.h" +#include "d_clisrv.h" #include "lua_script.h" #include "lua_libs.h" @@ -385,6 +386,8 @@ static int player_get(lua_State *L) else if (fastcmp(field,"fovadd")) lua_pushfixed(L, plr->fovadd); #endif + else if (fastcmp(field,"ping")) + lua_pushinteger(L, playerpingtable[( plr - players )]); else { lua_getfield(L, LUA_REGISTRYINDEX, LREG_EXTVARS); I_Assert(lua_istable(L, -1)); diff --git a/src/p_enemy.c b/src/p_enemy.c index 42ca7a57b..4b5818f73 100644 --- a/src/p_enemy.c +++ b/src/p_enemy.c @@ -8563,6 +8563,7 @@ static void SpawnSPBSpeedLines(mobj_t *actor) actor->z + (actor->height/2) + (P_RandomRange(-24,24) * actor->scale), MT_FASTLINE); + P_SetTarget(&fast->target, actor); fast->angle = R_PointToAngle2(0, 0, actor->momx, actor->momy); fast->color = SKINCOLOR_RED; fast->colorized = true; diff --git a/src/st_stuff.c b/src/st_stuff.c index e5510e89e..4b5bc7d09 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -1797,10 +1797,12 @@ static void ST_doItemFinderIconsAndSound(void) // SRB2kart - unused. // static void ST_overlayDrawer(void) { - /* SRB2kart doesn't need this stuff //hu_showscores = auto hide score/time/rings when tab rankings are shown if (!(hu_showscores && (netgame || multiplayer))) { + K_drawKartHUD(); + + /* SRB2kart doesn't need this stuff if (maptol & TOL_NIGHTS) ST_drawNiGHTSHUD(); else @@ -1824,8 +1826,8 @@ static void ST_overlayDrawer(void) ) ST_drawLives(); } - } */ + } // GAME OVER pic /*if (G_GametypeUsesLives() && stplyr->lives <= 0 && !(hu_showscores && (netgame || multiplayer))) @@ -1845,8 +1847,6 @@ static void ST_overlayDrawer(void) // Countdown timer for Race Mode // ...moved to k_kart.c so we can take advantage of the LAPS_Y value - K_drawKartHUD(); - /* SRB2kart doesn't need this stuff, I think // If you are in overtime, put a big honkin' flashin' message on the screen. if (G_BattleGametype() && cv_overtime.value