From 4db0affd2bbafb43b48fbc9d5088201b1d4c1a97 Mon Sep 17 00:00:00 2001 From: toaster Date: Tue, 14 Mar 2023 17:04:46 +0000 Subject: [PATCH] Addons menu: Show unlocks after backing out - For the Addons unlock condition. - Also forbids having menu flow interrupted with challenges if you're in-game --- src/menus/extras-addons.c | 2 +- src/menus/extras-challenges.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/menus/extras-addons.c b/src/menus/extras-addons.c index 0d2dbd85b..da76abc09 100644 --- a/src/menus/extras-addons.c +++ b/src/menus/extras-addons.c @@ -351,7 +351,7 @@ void M_HandleAddons(INT32 choice) //MainMenu[secrets].status = (M_AnySecretUnlocked()) ? (IT_STRING | IT_CALL) : (IT_DISABLED); if (currentMenu->prevMenu) - M_SetupNextMenu(currentMenu->prevMenu, false); + M_SetupNextMenu(M_InterruptMenuWithChallenges(currentMenu->prevMenu), false); else M_ClearMenus(true); diff --git a/src/menus/extras-challenges.c b/src/menus/extras-challenges.c index 05481d8e5..ad896b49d 100644 --- a/src/menus/extras-challenges.c +++ b/src/menus/extras-challenges.c @@ -205,6 +205,9 @@ menu_t *M_InterruptMenuWithChallenges(menu_t *desiredmenu) { UINT16 i, newunlock; + if (Playing()) + return desiredmenu; + M_UpdateUnlockablesAndExtraEmblems(false, true); newunlock = M_GetNextAchievedUnlock();