From 862a4437e93884ec87f8ca8ad7b5d13e23ded3a0 Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 11 Sep 2024 19:56:17 +0200 Subject: [PATCH] let item button toggle encore in mapselect screen guh --- src/m_menu.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/m_menu.c b/src/m_menu.c index 95a06ea5a..0f2e7fbbc 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -3653,6 +3653,15 @@ boolean M_Responder(event_t *ev) DPADRIGHTSCROLL = true; break; } + + if (currentMenu == &MISC_ChangeLevelDef || currentMenu == &MP_OfflineServerDef || currentMenu == &MP_ServerDef) + { + if (ev->data1 == gamecontrol[gc_fire][0] + || ev->data1 == gamecontrol[gc_fire][1]) + { + COM_ImmedExecute("add kartencore 1"); + } + } } else if (ev->type == ev_keyup) { @@ -10292,6 +10301,17 @@ static void M_DrawLevelSelectOnly(boolean leftfade, boolean rightfade) patch_t *PictureOfLevel; INT32 x, y, w, i, oldval, trans, dupadjust = ((vid.width/vid.dupx) - BASEVIDWIDTH)>>1; + char encoretoggle[32] = {0}; + const char *item1 = gamecontrol[gc_fire][0] != 0 ? G_KeynumToString(gamecontrol[gc_fire][0]) : NULL; + const char *item2 = gamecontrol[gc_fire][1] != 0 ? G_KeynumToString(gamecontrol[gc_fire][1]) : NULL; + + if (item1 != NULL && item2 != NULL) + snprintf(encoretoggle, 32, "%s/%s: Toggle Encore", item1, item2); + else + snprintf(encoretoggle, 32, "%s: Toggle Encore", item1 != NULL ? item1 : item2 != NULL ? item2 : "Item"); + + V_DrawThinString(1, BASEVIDHEIGHT-8-1, V_SNAPTOLEFT|V_SNAPTOBOTTOM|V_TRANSLUCENT|V_ALLOWLOWERCASE, encoretoggle); + // A 160x100 image of the level as entry MAPxxP if (cv_nextmap.value) {