Merge branch 'fix-nights-mode-menu-wrong-return' into 'master'

NiGHTS Mode menu fixes

See merge request STJr/SRB2!841
This commit is contained in:
SteelT 2020-03-18 15:41:17 -04:00
commit d2d8fe64f5

View file

@ -10099,13 +10099,13 @@ static void M_ReplayTimeAttack(INT32 choice)
static void M_EraseGuest(INT32 choice) static void M_EraseGuest(INT32 choice)
{ {
const char *rguest = va("%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s-guest.lmp", srb2home, timeattackfolder, G_BuildMapName(cv_nextmap.value)); const char *rguest = va("%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s-guest.lmp", srb2home, timeattackfolder, G_BuildMapName(cv_nextmap.value));
(void)choice;
if (FIL_FileExists(rguest)) if (choice == 'y' || choice == KEY_ENTER)
remove(rguest); {
if (currentMenu == &SP_NightsGuestReplayDef) if (FIL_FileExists(rguest))
M_SetupNextMenu(&SP_NightsAttackDef); remove(rguest);
else }
M_SetupNextMenu(&SP_TimeAttackDef); M_SetupNextMenu(currentMenu->prevMenu->prevMenu);
Nextmap_OnChange(); Nextmap_OnChange();
M_StartMessage(M_GetText("Guest replay data erased.\n"),NULL,MM_NOTHING); M_StartMessage(M_GetText("Guest replay data erased.\n"),NULL,MM_NOTHING);
} }