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

This commit is contained in:
James R 2024-01-11 03:05:27 -08:00
parent b932e23187
commit 17a43430a7
2 changed files with 11 additions and 2 deletions

View file

@ -5898,7 +5898,10 @@ void G_GetBackupCupData(boolean actuallygetdata)
P_GetBackupCupData(&save);
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.
cupsavedata.cup = NULL;

View file

@ -83,7 +83,13 @@ static void M_StartCup(UINT8 entry)
// Populate the 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.netcommunicate = true; // relevant for future Online GP
}