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

Merge branch 'mpspecfix2' into 'master' 

Counting spheres (resolves #378).

Closes #378

See merge request STJr/SRB2Internal!564
This commit is contained in:
MascaraSnake 2019-11-28 13:54:47 -05:00
parent 9146888ce7 a3050063cd
commit 546c54b390
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/p_tick.c
View File

@ -476,11 +476,14 @@ static inline void P_DoSpecialStageStuff(void)
// Count up the rings of all the players and see if
// they've collected the required amount.
for (i = 0; i < MAXPLAYERS; i++)
if (playeringame[i] && players[i].nightstime)
if (playeringame[i])
{
tic_t oldnightstime = players[i].nightstime;
countspheres += players[i].spheres;
if (!oldnightstime)
continue;
// If in water, deplete timer 6x as fast.
if (players[i].mo->eflags & (MFE_TOUCHWATER|MFE_UNDERWATER) && !(players[i].powers[pw_shield] & SH_PROTECTWATER))
players[i].nightstime -= 5;