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

Merge branch 'prisons-reset' into 'master'

Browse source 
Fix Battle not resetting to Prisons when the server empties to 1P

Closes #1277

See merge request KartKrew/Kart!2280
This commit is contained in:
Sal 2024-04-14 17:10:49 +00:00
commit 9964d022f7
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/k_battle.c
View file

@ -179,26 +179,26 @@ void K_CheckBumpers(void)
return; return;
} }
} }
else if (eliminated >= numingame - 1) else if (numingame > 1)
{ {
// If every other player is eliminated, the // If every other player is eliminated, the
// last player standing wins by default. // last player standing wins by default.
if (numingame > 1) if (eliminated >= numingame - 1)
{
K_EndBattleRound(kingofthehill != -1 ? &players[kingofthehill] : NULL); K_EndBattleRound(kingofthehill != -1 ? &players[kingofthehill] : NULL);
return; return;
} }
}
if (numingame <= 1) else
{ {
if ((gametyperules & GTR_PRISONS) && !battleprisons && (K_CanChangeRules(true) == true)) if ((gametyperules & GTR_PRISONS) && !battleprisons && (K_CanChangeRules(true) == true))
{ {
// Reset map to turn on battle prisons // Reset map to turn on battle prisons
if (server) if (server)
D_MapChange(gamemap, gametype, encoremode, true, 0, false, false); D_MapChange(gamemap, gametype, encoremode, true, 1, false, false);
}
return; return;
} }
}
} }
void K_CheckEmeralds(player_t *player) void K_CheckEmeralds(player_t *player)