Merge branch 'fault-text-cutoff' into 'master'

Fix FAULT text immediately disappearing the moment leveltime exceeds starttime+TICRATE

See merge request KartKrew/Kart!2254
This commit is contained in:
Sal 2024-04-10 23:27:54 +00:00
commit d607999a37

View file

@ -5066,16 +5066,7 @@ static void K_drawKartStartCountdown(void)
{
INT32 pnum = 0;
if (stplyr->lives <= 0 && stplyr->playerstate == PST_DEAD)
{
return;
}
if (stplyr->karthud[khud_fault] != 0 && stplyr->karthud[khud_finish] == 0)
{
K_drawKartFinish(false);
}
else if (leveltime >= introtime && leveltime < starttime-(3*TICRATE))
if (leveltime >= introtime && leveltime < starttime-(3*TICRATE))
{
if (numbulbs > 1)
K_drawKartStartBulbs();
@ -6293,7 +6284,15 @@ void K_drawKartHUD(void)
}
// Draw the countdowns after everything else.
if (starttime != introtime
if (stplyr->lives <= 0 && stplyr->playerstate == PST_DEAD)
{
;
}
else if (stplyr->karthud[khud_fault] != 0 && stplyr->karthud[khud_finish] == 0)
{
K_drawKartFinish(false);
}
else if (starttime != introtime
&& leveltime >= introtime
&& leveltime < starttime+TICRATE)
{