From 4fd5873e0f1cb9bd25242334b70a3e2479fad0ba Mon Sep 17 00:00:00 2001 From: AJ Martinez Date: Sun, 10 Mar 2024 15:47:49 -0700 Subject: [PATCH 1/2] All TA deaths are final deaths --- src/k_hud.cpp | 2 +- src/p_inter.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/k_hud.cpp b/src/k_hud.cpp index 826a1c0f2..d5d16ab49 100644 --- a/src/k_hud.cpp +++ b/src/k_hud.cpp @@ -5011,7 +5011,7 @@ static void K_drawKartStartCountdown(void) return; } - if (stplyr->karthud[khud_fault] != 0) + if (stplyr->karthud[khud_fault] != 0 && stplyr->karthud[khud_finish] == 0) { K_drawKartFinish(false); } diff --git a/src/p_inter.c b/src/p_inter.c index fb39564ed..34c484150 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -2526,7 +2526,7 @@ static boolean P_KillPlayer(player_t *player, mobj_t *inflictor, mobj_t *source, return false; } - if (modeattacking & ATTACKING_SPB) + if (modeattacking) { // Death in SPB Attack is an instant loss. P_DoPlayerExit(player, PF_NOCONTEST); From 448781bdd9bc601b40649feff50107f9cbc99b0d Mon Sep 17 00:00:00 2001 From: James R Date: Sun, 10 Mar 2024 19:23:03 -0700 Subject: [PATCH 2/2] HUD: do not scroll FINISH across the screen when NO CONTESTING - Don't show this for Time Attack fail --- src/k_kart.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index 0421fc1bd..20bc20bba 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -8105,9 +8105,7 @@ void K_KartPlayerHUDUpdate(player_t *player) player->karthud[khud_ringspblock] = (leveltime % 14); // reset to normal anim next time } - if (player->exiting - && (specialstageinfo.valid == false - || !(player->pflags & PF_NOCONTEST))) + if (player->exiting && !(player->pflags & PF_NOCONTEST)) { if (player->karthud[khud_finish] <= 2*TICRATE) player->karthud[khud_finish]++;