From b41306dfa0693b67ad6ee3a1526ab5f8a0a94df3 Mon Sep 17 00:00:00 2001 From: Alug Date: Fri, 5 Dec 2025 17:17:58 +0100 Subject: [PATCH] Menus: dont advertise encore toggle if its not unlocked yet! this wont do anything anyways besides telling you you havent unlocked it yet so can just hide it --- src/m_menu.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/src/m_menu.c b/src/m_menu.c index 55cc0f3f9..04997e6d3 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -1032,18 +1032,6 @@ boolean M_Responder(event_t *ev) ch = KEY_RIGHTARROW; break; } - - if (menuactive) - { - if (currentMenu == &MISC_ChangeLevelDef || currentMenu == &MP_OfflineServerDef || currentMenu == &MP_ServerDef) - { - if (ch == gamecontrol[0][gc_fire][0] - || ch == gamecontrol[0][gc_fire][1]) - { - COM_ImmedExecute("add kartencore 1"); - } - } - } } else if (menuactive) { @@ -1235,6 +1223,19 @@ boolean M_Responder(event_t *ev) if ((ch == gamecontrol[0][gc_brake][0] || ch == gamecontrol[0][gc_brake][1]) && ch >= KEY_MOUSE1) // do this here, otherwise brake opens the menu mid-game ch = KEY_ESCAPE; + if (currentMenu == &MISC_ChangeLevelDef || + currentMenu == &MP_OfflineServerDef || + currentMenu == &MP_ServerDef) + { + if (ch == gamecontrol[0][gc_fire][0] + || ch == gamecontrol[0][gc_fire][1]) + { + if (M_SecretUnlocked(SECRET_ENCORE)) + COM_ImmedExecute("add kartencore 1"); + return true; + } + } + routine = currentMenu->menuitems[itemOn].itemaction; // Handle menuitems which need a specific key handling @@ -7381,7 +7382,8 @@ static void M_DrawLevelSelectOnly(boolean leftfade, boolean rightfade) patch_t *PictureOfLevel; INT32 x, y, w, i, oldval, trans, dupadjust = (vid.scaledwidth - BASEVIDWIDTH)>>1; - if (levellistmode != LLM_RECORDATTACK) // so it doesent show in record attack menu + // so it doesent show in record attack menu + if (levellistmode != LLM_RECORDATTACK && M_SecretUnlocked(SECRET_ENCORE)) // gotta have it unlocked first ofc { char encoretoggle[32] = {0}; const char *item1 = gamecontrol[0][gc_fire][0] != 0 ? G_KeynumToString(gamecontrol[0][gc_fire][0]) : NULL;