mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2026-05-03 23:42:07 +00:00
Add checks to G_GPCupIntoRoundQueue to account for potential multi-gametype special stage maps (in order of Special>Versus>guess).
This commit is contained in:
parent
2989d3564e
commit
6780b5f607
1 changed files with 14 additions and 1 deletions
15
src/g_game.c
15
src/g_game.c
|
|
@ -4322,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!
|
||||||
);
|
);
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue