Merge branch 'inflivesfix' into 'master'

Prevent infinite lives rollover to extremely negative numbers.

See merge request STJr/SRB2Internal!446
This commit is contained in:
MascaraSnake 2019-11-11 11:25:20 -05:00
commit d1e800e1a8

View file

@ -1240,6 +1240,8 @@ void P_GivePlayerLives(player_t *player, INT32 numlives)
numlives = (numlives + prevlives - player->lives);
}
}
else if (player->lives == INFLIVES)
return;
player->lives += numlives;