stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-18 07:22:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'timeoverrings' into 'master'

Browse source 
Time Over rings (resolves #446).

Closes #446

See merge request STJr/SRB2Internal!596
This commit is contained in:
MascaraSnake 2019-12-04 17:09:32 -05:00
commit a7884e479a
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/y_inter.c
View file

@ -1623,11 +1623,14 @@ static void Y_CalculateCompetitionWinners(void)
for (j = 0; j < 5; j++) for (j = 0; j < 5; j++)
bestat[j] = true; bestat[j] = true;
if ((players[i].pflags & PF_GAMETYPEOVER) || players[i].lives <= 0)
players[i].rings = 0;
times[i] = players[i].realtime; times[i] = players[i].realtime;
rings[i] = (UINT32)max(players[i].rings, 0); rings[i] = (UINT32)max(players[i].rings, 0);
maxrings[i] = (UINT32)players[i].totalring; maxrings[i] = (UINT32)players[i].totalring;
monitors[i] = (UINT32)players[i].numboxes; monitors[i] = (UINT32)players[i].numboxes;
scores[i] = (UINT32)min(players[i].score, 99999990); scores[i] = (UINT32)min(players[i].score, MAXSCORE);
for (j = 0; j < MAXPLAYERS; j++) for (j = 0; j < MAXPLAYERS; j++)
{ {