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 'no-gp-encore' into 'master'

Browse source 
Menus/Grand Prix: do not carry over Encore setting from Match Race

Closes #830

See merge request KartKrew/Kart!1816
This commit is contained in:
Oni 2024-01-13 23:11:31 +00:00
commit f9c192b04d
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/g_game.c
View file

@ -5898,7 +5898,10 @@ void G_GetBackupCupData(boolean actuallygetdata)
P_GetBackupCupData(&save); P_GetBackupCupData(&save);
if (cv_dummygpdifficulty.value != cupsavedata.difficulty if (cv_dummygpdifficulty.value != cupsavedata.difficulty
|| !!cv_dummygpencore.value != cupsavedata.encore) #if 0 // TODO: encore GP
|| !!cv_dummygpencore.value != cupsavedata.encore
#endif
)
{ {
// Still not compatible. // Still not compatible.
cupsavedata.cup = NULL; cupsavedata.cup = NULL;

8
src/menus/transient/cup-select.c
View file

@ -83,7 +83,13 @@ static void M_StartCup(UINT8 entry)
// Populate the roundqueue // Populate the roundqueue
memset(&roundqueue, 0, sizeof(struct roundqueue)); memset(&roundqueue, 0, sizeof(struct roundqueue));
G_GPCupIntoRoundQueue(levellist.levelsearch.cup, levellist.newgametype, (boolean)cv_dummygpencore.value); G_GPCupIntoRoundQueue(levellist.levelsearch.cup, levellist.newgametype,
#if 0 // TODO: encore GP
(boolean)cv_dummygpencore.value
#else
false
#endif
);
roundqueue.position = roundqueue.roundnum = 1; roundqueue.position = roundqueue.roundnum = 1;
roundqueue.netcommunicate = true; // relevant for future Online GP roundqueue.netcommunicate = true; // relevant for future Online GP
} }