mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2025-03-23 19:31:05 +00:00
look for GTR_LIVES rule instead of coop/competition gametype
This commit is contained in:
parent
f8eed7171a
commit
f0d58368f9
1 changed files with 2 additions and 2 deletions
|
@ -1230,7 +1230,7 @@ void P_GivePlayerLives(player_t *player, INT32 numlives)
|
|||
|
||||
if (gamestate == GS_LEVEL)
|
||||
{
|
||||
if (player->lives == INFLIVES || (gametype != GT_COOP && gametype != GT_COMPETITION))
|
||||
if (player->lives == INFLIVES || !(gametyperules & GTR_LIVES))
|
||||
{
|
||||
P_GivePlayerRings(player, 100*numlives);
|
||||
return;
|
||||
|
@ -1395,7 +1395,7 @@ void P_AddPlayerScore(player_t *player, UINT32 amount)
|
|||
player->score = MAXSCORE;
|
||||
|
||||
// check for extra lives every 50000 pts
|
||||
if (!ultimatemode && !modeattacking && player->score > oldscore && player->score % 50000 < amount && (gametype == GT_COMPETITION || gametype == GT_COOP))
|
||||
if (!ultimatemode && !modeattacking && player->score > oldscore && player->score % 50000 < amount && (gametyperules & GTR_LIVES))
|
||||
{
|
||||
P_GivePlayerLives(player, (player->score/50000) - (oldscore/50000));
|
||||
P_PlayLivesJingle(player);
|
||||
|
|
Loading…
Reference in a new issue