stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-29 12:40:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Make 100 rings give everyone a oneup in New Coop.

Browse source 
* Make oneup boxes only give everyone a oneup in New Coop.
This commit is contained in:
toasterbabe 2017-05-28 17:07:20 +01:00
parent c508695c5a
commit 965e1f6b45
2 changed files with 35 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/p_enemy.c
View file

@ -3286,20 +3286,26 @@ void A_ExtraLife(mobj_t *actor)
} }
else else
{ {
INT32 i; if (!((netgame || multiplayer) && gametype == GT_COOP))
for (i = 0; i < MAXPLAYERS; i++) P_GivePlayerLives(player, 1);
P_PlayLivesJingle(player);
else
{ {
if (!playeringame[i]) INT32 i;
continue; for (i = 0; i < MAXPLAYERS; i++)
{
if (!playeringame[i])
continue;
if ((netgame || multiplayer) && players[i].spectator) // Ignore spectators if ((netgame || multiplayer) && players[i].spectator) // Ignore spectators
continue; continue;
if (players[i].bot) if (players[i].bot)
continue; continue;
P_GivePlayerLives(&players[i], 1); P_GivePlayerLives(&players[i], 1);
P_PlayLivesJingle(&players[i]); P_PlayLivesJingle(&players[i]);
}
} }
} }
} }

21
src/p_user.c
View file

@ -933,8 +933,25 @@ void P_GivePlayerRings(player_t *player, INT32 num_rings)
if (gainlives) if (gainlives)
{ {
P_GivePlayerLives(player, gainlives); INT32 i;
P_PlayLivesJingle(player); if (!((netgame || multiplayer) && gametype == GT_COOP))
P_GivePlayerLives(player, gainlives);
P_PlayLivesJingle(player);
else
for (i = 0; i < MAXPLAYERS; i++)
{
if (!playeringame[i])
continue;
if ((netgame || multiplayer) && players[i].spectator) // Ignore spectators
continue;
if (players[i].bot)
continue;
P_GivePlayerLives(&players[i], gainlives);
P_PlayLivesJingle(&players[i]);
}
} }
} }
} }