Merge branch 'eliminatelast-developer-support' into 'master'

DEVELOP: let eliminatelast be turned off in GP

See merge request KartKrew/Kart!2109
This commit is contained in:
AJ Martinez 2024-03-14 09:50:05 +00:00
commit 35d9079140
2 changed files with 4 additions and 0 deletions

View file

@ -7168,10 +7168,12 @@ void KartEncore_OnChange(void)
void KartEliminateLast_OnChange(void); void KartEliminateLast_OnChange(void);
void KartEliminateLast_OnChange(void) void KartEliminateLast_OnChange(void)
{ {
#ifndef DEVELOP
if (K_CanChangeRules(false) == false) if (K_CanChangeRules(false) == false)
{ {
CV_StealthSet(&cv_karteliminatelast, cv_karteliminatelast.defaultvalue); CV_StealthSet(&cv_karteliminatelast, cv_karteliminatelast.defaultvalue);
} }
#endif
P_CheckRacers(); P_CheckRacers();
} }

View file

@ -1554,11 +1554,13 @@ boolean P_CheckRacers(void)
// Don't do this if someone spectated // Don't do this if someone spectated
eliminateLast = false; eliminateLast = false;
} }
#ifndef DEVELOP
else if (grandprixinfo.gp == true) else if (grandprixinfo.gp == true)
{ {
// Always do this in GP // Always do this in GP
eliminateLast = true; eliminateLast = true;
} }
#endif
} }
if (eliminateLast == true && (numExiting >= numPlaying-1)) if (eliminateLast == true && (numExiting >= numPlaying-1))