thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rework the conditions for the previous commit

Browse source 
- The "never force a retry" condition is now `!G_GametypeUsesLives()`
- In GT_SPECIAL *and* GT_VERSUS, check for K_IsPlayerLosing before retry, instead of bespoke check
This commit is contained in:
toaster 2022-12-31 18:59:56 +00:00
parent 39e68d1ae3
commit a86ed5c6cb
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/g_game.c
View file

@ -2917,20 +2917,16 @@ void G_ExitLevel(void)
UINT8 i; UINT8 i;
boolean doretry = false; boolean doretry = false;
if (modeattacking != ATTACKING_NONE) if (!G_GametypeUsesLives())
; ; // never force a retry
else if (specialstageinfo.valid == true) else if (specialstageinfo.valid == true || (gametyperules & GTR_BOSS)
{
doretry = (specialstageinfo.ufo != NULL);
}
else if (gametyperules & GTR_BOSS)
{ {
doretry = true; doretry = true;
for (i = 0; i < MAXPLAYERS; i++) for (i = 0; i < MAXPLAYERS; i++)
{ {
if (playeringame[i] && !players[i].spectator && !players[i].bot) if (playeringame[i] && !players[i].spectator && !players[i].bot)
{ {
if (players[i].bumpers > 0) if (!K_IsPlayerLosing(&players[i]))
{ {
doretry = false; doretry = false;
break; break;