Wrongwarp: Back to title on closure

This commit is contained in:
toaster 2023-06-09 17:40:14 +01:00
parent 7d4efd6629
commit 341db75d34
2 changed files with 3 additions and 4 deletions

View file

@ -373,7 +373,7 @@ void M_ChallengesTick(void)
if (challengesmenu.chaokeyhold > CHAOHOLD_MAX) if (challengesmenu.chaokeyhold > CHAOHOLD_MAX)
{ {
gamedata->chaokeys--; //gamedata->chaokeys--;
challengesmenu.chaokeyhold = 0; challengesmenu.chaokeyhold = 0;
challengesmenu.unlockcount[CC_CHAOANIM]++; challengesmenu.unlockcount[CC_CHAOANIM]++;
@ -600,7 +600,7 @@ boolean M_ChallengesInputs(INT32 ch)
challengesmenu.unlockcount[CC_CHAONOPE] = 6; challengesmenu.unlockcount[CC_CHAONOPE] = 6;
S_StartSound(NULL, sfx_s3k7b); //sfx_s3kb2 S_StartSound(NULL, sfx_s3k7b); //sfx_s3kb2
#if 0 // debugging #if 1 // debugging
if (challengesmenu.currentunlock < MAXUNLOCKABLES && challengesmenu.unlockanim >= UNLOCKTIME && gamedata->unlocked[challengesmenu.currentunlock] == true) if (challengesmenu.currentunlock < MAXUNLOCKABLES && challengesmenu.unlockanim >= UNLOCKTIME && gamedata->unlocked[challengesmenu.currentunlock] == true)
{ {
gamedata->unlocked[challengesmenu.currentunlock] = gamedata->unlockpending[challengesmenu.currentunlock] = false; gamedata->unlocked[challengesmenu.currentunlock] = gamedata->unlockpending[challengesmenu.currentunlock] = false;

View file

@ -19,7 +19,6 @@ void M_WrongWarp(INT32 choice)
wrongwarp.ticker = 0; wrongwarp.ticker = 0;
MISC_WrongWarpDef.prevMenu = currentMenu;
M_SetupNextMenu(&MISC_WrongWarpDef, false); M_SetupNextMenu(&MISC_WrongWarpDef, false);
// Done here to avoid immediate music credit // Done here to avoid immediate music credit
@ -138,7 +137,7 @@ static boolean M_WrongWarpInputs(INT32 ch)
menu_t MISC_WrongWarpDef = { menu_t MISC_WrongWarpDef = {
sizeof (MISC_WrongWarpMenu)/sizeof (menuitem_t), sizeof (MISC_WrongWarpMenu)/sizeof (menuitem_t),
&MainDef, NULL,
0, 0,
MISC_WrongWarpMenu, MISC_WrongWarpMenu,
0, 0, 0, 0,