mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2025-01-17 23:21:22 +00:00
* Make 100 rings give everyone a oneup in New Coop.
* Make oneup boxes only give everyone a oneup in New Coop.
This commit is contained in:
parent
c508695c5a
commit
965e1f6b45
2 changed files with 35 additions and 12 deletions
|
@ -3286,20 +3286,26 @@ void A_ExtraLife(mobj_t *actor)
|
|||
}
|
||||
else
|
||||
{
|
||||
INT32 i;
|
||||
for (i = 0; i < MAXPLAYERS; i++)
|
||||
if (!((netgame || multiplayer) && gametype == GT_COOP))
|
||||
P_GivePlayerLives(player, 1);
|
||||
P_PlayLivesJingle(player);
|
||||
else
|
||||
{
|
||||
if (!playeringame[i])
|
||||
continue;
|
||||
INT32 i;
|
||||
for (i = 0; i < MAXPLAYERS; i++)
|
||||
{
|
||||
if (!playeringame[i])
|
||||
continue;
|
||||
|
||||
if ((netgame || multiplayer) && players[i].spectator) // Ignore spectators
|
||||
continue;
|
||||
if ((netgame || multiplayer) && players[i].spectator) // Ignore spectators
|
||||
continue;
|
||||
|
||||
if (players[i].bot)
|
||||
continue;
|
||||
if (players[i].bot)
|
||||
continue;
|
||||
|
||||
P_GivePlayerLives(&players[i], 1);
|
||||
P_PlayLivesJingle(&players[i]);
|
||||
P_GivePlayerLives(&players[i], 1);
|
||||
P_PlayLivesJingle(&players[i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
21
src/p_user.c
21
src/p_user.c
|
@ -933,8 +933,25 @@ void P_GivePlayerRings(player_t *player, INT32 num_rings)
|
|||
|
||||
if (gainlives)
|
||||
{
|
||||
P_GivePlayerLives(player, gainlives);
|
||||
P_PlayLivesJingle(player);
|
||||
INT32 i;
|
||||
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]);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue