lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'finalcountdown' into 'master' 

The final countdown (resolves #400).

Closes #400

See merge request STJr/SRB2Internal!574
This commit is contained in:
MascaraSnake 2019-11-30 04:03:07 -05:00
parent 8a3c7da1d2 fdcc8c912a
commit 6bbc412eac
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/st_stuff.c
View File

@ -699,6 +699,7 @@ static void ST_drawTime(void)
tics = (hidetime*TICRATE - stplyr->realtime);
if (tics < 3*TICRATE)
ST_drawRaceNum(tics);
tics += (TICRATE-1); // match the race num
downwards = true;
}
else
@ -710,11 +711,12 @@ static void ST_drawTime(void)
// Time limit?
if (gametype != GT_COOP && gametype != GT_RACE && gametype != GT_COMPETITION && cv_timelimit.value && timelimitintics > 0)
{
if (timelimitintics >= stplyr->realtime)
if (timelimitintics > stplyr->realtime)
{
tics = (timelimitintics + (TICRATE-1) - stplyr->realtime);
tics = (timelimitintics - stplyr->realtime);
if (tics < 3*TICRATE)
ST_drawRaceNum(tics);
tics += (TICRATE-1); // match the race num
}
else // Overtime!
tics = 0;