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

look for GTR_LIVES rule instead of coop/competition gametype

Browse source
This commit is contained in:
Jaime Passos 2019-12-27 12:29:21 -03:00
parent f8eed7171a
commit f0d58368f9
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/p_user.c
View file

@ -1230,7 +1230,7 @@ void P_GivePlayerLives(player_t *player, INT32 numlives)
if (gamestate == GS_LEVEL) 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); P_GivePlayerRings(player, 100*numlives);
return; return;
@ -1395,7 +1395,7 @@ void P_AddPlayerScore(player_t *player, UINT32 amount)
player->score = MAXSCORE; player->score = MAXSCORE;
// check for extra lives every 50000 pts // 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_GivePlayerLives(player, (player->score/50000) - (oldscore/50000));
P_PlayLivesJingle(player); P_PlayLivesJingle(player);