From 341db75d34f0ce0cb1bbf0536d06d28d0a04bf29 Mon Sep 17 00:00:00 2001 From: toaster Date: Fri, 9 Jun 2023 17:40:14 +0100 Subject: [PATCH] Wrongwarp: Back to title on closure --- src/menus/extras-challenges.c | 4 ++-- src/menus/extras-wrong.c | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/menus/extras-challenges.c b/src/menus/extras-challenges.c index 1fa4a3f86..c254a14a2 100644 --- a/src/menus/extras-challenges.c +++ b/src/menus/extras-challenges.c @@ -373,7 +373,7 @@ void M_ChallengesTick(void) if (challengesmenu.chaokeyhold > CHAOHOLD_MAX) { - gamedata->chaokeys--; + //gamedata->chaokeys--; challengesmenu.chaokeyhold = 0; challengesmenu.unlockcount[CC_CHAOANIM]++; @@ -600,7 +600,7 @@ boolean M_ChallengesInputs(INT32 ch) challengesmenu.unlockcount[CC_CHAONOPE] = 6; 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) { gamedata->unlocked[challengesmenu.currentunlock] = gamedata->unlockpending[challengesmenu.currentunlock] = false; diff --git a/src/menus/extras-wrong.c b/src/menus/extras-wrong.c index 3a68f3878..4d4befc22 100644 --- a/src/menus/extras-wrong.c +++ b/src/menus/extras-wrong.c @@ -19,7 +19,6 @@ void M_WrongWarp(INT32 choice) wrongwarp.ticker = 0; - MISC_WrongWarpDef.prevMenu = currentMenu; M_SetupNextMenu(&MISC_WrongWarpDef, false); // Done here to avoid immediate music credit @@ -138,7 +137,7 @@ static boolean M_WrongWarpInputs(INT32 ch) menu_t MISC_WrongWarpDef = { sizeof (MISC_WrongWarpMenu)/sizeof (menuitem_t), - &MainDef, + NULL, 0, MISC_WrongWarpMenu, 0, 0,