thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-02 14:12:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Eliminate the last place bot properly

Browse source
This commit is contained in:
Sally Coolatta 2020-05-13 21:29:46 -04:00
parent 5c8275f905
commit 62cc86c788
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/p_inter.c
View file

@ -1977,7 +1977,8 @@ boolean P_CheckRacers(void)
UINT8 numplayersingame = 0; UINT8 numplayersingame = 0;
UINT8 numexiting = 0; UINT8 numexiting = 0;
boolean eliminatelast = cv_karteliminatelast.value; boolean eliminatelast = cv_karteliminatelast.value;
boolean canexit = true; boolean everyonedone = true;
boolean eliminatebots = false;
boolean griefed = false; boolean griefed = false;
// Check if all the players in the race have finished. If so, end the level. // Check if all the players in the race have finished. If so, end the level.
@ -2005,14 +2006,19 @@ boolean P_CheckRacers(void)
if (players[i].bot) if (players[i].bot)
{ {
// Isn't a human, thus doesn't matter. (Sorry, robots.) // Isn't a human, thus doesn't matter. (Sorry, robots.)
// Set this so that we can check for bots that need to get eliminated, though!
eliminatebots = true;
continue; continue;
} }
canexit = false; everyonedone = false;
} }
} }
if (canexit) // If we returned here with bots left, then the last place bot may have a chance to finish the map and NOT get time over.
// Not that it affects anything, they didn't make the map take longer or even get any points from it. But... it's a bit inconsistent!
// So if there's any bots, we'll let the game skip this, continue onto calculating eliminatelast, THEN we return true anyway.
if (everyonedone && !eliminatebots)
{ {
// Everyone's finished, we're done here! // Everyone's finished, we're done here!
racecountdown = exitcountdown = 0; racecountdown = exitcountdown = 0;
@ -2065,6 +2071,13 @@ boolean P_CheckRacers(void)
return true; return true;
} }
if (everyonedone)
{
// See above: there might be bots that are still going, but all players are done, so we can exit now.
racecountdown = exitcountdown = 0;
return true;
}
// SO, we're not done playing. // SO, we're not done playing.
// Let's see if it's time to start the death counter! // Let's see if it's time to start the death counter!