thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-03 06:33:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'die-in-ta' into 'master'

Browse source 
All TA deaths are final deaths

See merge request KartKrew/Kart!2077
This commit is contained in:
AJ Martinez 2024-03-11 02:27:10 +00:00
commit 32e2999386
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/k_hud.cpp
View file

@ -5011,7 +5011,7 @@ static void K_drawKartStartCountdown(void)
return; return;
} }
if (stplyr->karthud[khud_fault] != 0) if (stplyr->karthud[khud_fault] != 0 && stplyr->karthud[khud_finish] == 0)
{ {
K_drawKartFinish(false); K_drawKartFinish(false);
} }

4
src/k_kart.c
View file

@ -8105,9 +8105,7 @@ void K_KartPlayerHUDUpdate(player_t *player)
player->karthud[khud_ringspblock] = (leveltime % 14); // reset to normal anim next time player->karthud[khud_ringspblock] = (leveltime % 14); // reset to normal anim next time
} }
if (player->exiting if (player->exiting && !(player->pflags & PF_NOCONTEST))
&& (specialstageinfo.valid == false
|| !(player->pflags & PF_NOCONTEST)))
{ {
if (player->karthud[khud_finish] <= 2*TICRATE) if (player->karthud[khud_finish] <= 2*TICRATE)
player->karthud[khud_finish]++; player->karthud[khud_finish]++;

2
src/p_inter.c
View file

@ -2526,7 +2526,7 @@ static boolean P_KillPlayer(player_t *player, mobj_t *inflictor, mobj_t *source,
return false; return false;
} }
if (modeattacking & ATTACKING_SPB) if (modeattacking)
{ {
// Death in SPB Attack is an instant loss. // Death in SPB Attack is an instant loss.
P_DoPlayerExit(player, PF_NOCONTEST); P_DoPlayerExit(player, PF_NOCONTEST);