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 'gp-race-or-battle-decider' into 'master'

Browse source 
Add check to G_GPCupIntoRoundQueue to ensure bonus game maps with both Race and Battle TOLs are treated as Battle.

See merge request kart-krew-dev/ring-racers!49
This commit is contained in:
Eidolon 2025-10-06 14:42:11 -05:00
commit 1b3012604c
1 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/g_game.c
View file

@ -4202,6 +4202,7 @@ void G_GPCupIntoRoundQueue(cupheader_t *cup, UINT8 setgametype, boolean setencor
UINT8 i, levelindex = 0, bonusindex = 0; UINT8 i, levelindex = 0, bonusindex = 0;
UINT8 bonusmodulo = max(1, (cup->numlevels+1)/(cup->numbonus+1)); UINT8 bonusmodulo = max(1, (cup->numlevels+1)/(cup->numbonus+1));
UINT16 cupLevelNum; UINT16 cupLevelNum;
INT32 bonusgt;
// Levels are added to the queue in the following pattern. // Levels are added to the queue in the following pattern.
// For 5 Race rounds and 2 Bonus rounds, the most common case: // For 5 Race rounds and 2 Bonus rounds, the most common case:
@ -4243,9 +4244,17 @@ void G_GPCupIntoRoundQueue(cupheader_t *cup, UINT8 setgametype, boolean setencor
if (cupLevelNum < nummapheaders) if (cupLevelNum < nummapheaders)
{ {
// In the case of Bonus rounds, we simply skip invalid maps. // In the case of Bonus rounds, we simply skip invalid maps.
if ((mapheaderinfo[cupLevelNum]->typeoflevel & TOL_BATTLE) == TOL_BATTLE)
{
bonusgt = GT_BATTLE;
}
else
{
bonusgt = G_GuessGametypeByTOL(mapheaderinfo[cupLevelNum]->typeoflevel);
}
G_MapIntoRoundQueue( G_MapIntoRoundQueue(
cupLevelNum, cupLevelNum,
G_GuessGametypeByTOL(mapheaderinfo[cupLevelNum]->typeoflevel), bonusgt,
setencore, // if this isn't correct, Got_Mapcmd will fix it setencore, // if this isn't correct, Got_Mapcmd will fix it
false false
); );
@ -4313,9 +4322,22 @@ void G_GPCupIntoRoundQueue(cupheader_t *cup, UINT8 setgametype, boolean setencor
cupLevelNum = emeraldcup->cachedlevels[CUPCACHE_SPECIAL]; cupLevelNum = emeraldcup->cachedlevels[CUPCACHE_SPECIAL];
if (cupLevelNum < nummapheaders) if (cupLevelNum < nummapheaders)
{ {
// In case of multiple TOLs, prioritize Special, then Versus, then guess.
if ((mapheaderinfo[cupLevelNum]->typeoflevel & TOL_SPECIAL) == TOL_SPECIAL)
{
bonusgt = GT_SPECIAL;
}
else if ((mapheaderinfo[cupLevelNum]->typeoflevel & TOL_VERSUS) == TOL_VERSUS)
{
bonusgt = GT_VERSUS;
}
else
{
bonusgt = G_GuessGametypeByTOL(mapheaderinfo[cupLevelNum]->typeoflevel);
}
G_MapIntoRoundQueue( G_MapIntoRoundQueue(
cupLevelNum, cupLevelNum,
G_GuessGametypeByTOL(mapheaderinfo[cupLevelNum]->typeoflevel), bonusgt,
setencore, // if this isn't correct, Got_Mapcmd will fix it setencore, // if this isn't correct, Got_Mapcmd will fix it
true // Rank-restricted! true // Rank-restricted!
); );