Merge branch 'mpspecfix2' into 'master'
Counting spheres (resolves #378). Closes #378 See merge request STJr/SRB2Internal!564
This commit is contained in:
commit
546c54b390
|
@ -476,11 +476,14 @@ static inline void P_DoSpecialStageStuff(void)
|
||||||
// Count up the rings of all the players and see if
|
// Count up the rings of all the players and see if
|
||||||
// they've collected the required amount.
|
// they've collected the required amount.
|
||||||
for (i = 0; i < MAXPLAYERS; i++)
|
for (i = 0; i < MAXPLAYERS; i++)
|
||||||
if (playeringame[i] && players[i].nightstime)
|
if (playeringame[i])
|
||||||
{
|
{
|
||||||
tic_t oldnightstime = players[i].nightstime;
|
tic_t oldnightstime = players[i].nightstime;
|
||||||
countspheres += players[i].spheres;
|
countspheres += players[i].spheres;
|
||||||
|
|
||||||
|
if (!oldnightstime)
|
||||||
|
continue;
|
||||||
|
|
||||||
// If in water, deplete timer 6x as fast.
|
// If in water, deplete timer 6x as fast.
|
||||||
if (players[i].mo->eflags & (MFE_TOUCHWATER|MFE_UNDERWATER) && !(players[i].powers[pw_shield] & SH_PROTECTWATER))
|
if (players[i].mo->eflags & (MFE_TOUCHWATER|MFE_UNDERWATER) && !(players[i].powers[pw_shield] & SH_PROTECTWATER))
|
||||||
players[i].nightstime -= 5;
|
players[i].nightstime -= 5;
|
||||||
|
|
Loading…
Reference in a new issue