From 73768b0fc410c4554d2189be4adf1ddc400a6c41 Mon Sep 17 00:00:00 2001 From: minenice55 Date: Sun, 19 Apr 2026 21:41:49 -0400 Subject: [PATCH] remove the special cases related to the PAUSE key don't get why these exist --- src/g_game.c | 2 -- src/g_game.h | 1 - src/g_input.c | 2 +- src/hu_stuff.c | 2 +- src/m_menu.c | 30 +++++++++++++++--------------- 5 files changed, 17 insertions(+), 20 deletions(-) diff --git a/src/g_game.c b/src/g_game.c index 22f348415..2a321cf2f 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -2001,7 +2001,6 @@ boolean G_IsTitleCardAvailable(void) } INT32 pausedelay = 0; -boolean pausebreakkey = false; static INT32 camtoggledelay[MAXSPLITSCREENPLAYERS]; static INT32 spectatedelay[MAXSPLITSCREENPLAYERS]; static INT32 respawndelay[MAXSPLITSCREENPLAYERS]; @@ -2183,7 +2182,6 @@ boolean G_Responder(event_t *ev) { if (modeattacking && !demo.playback && (gamestate == GS_LEVEL)) { - pausebreakkey = (ev->data1 == KEY_PAUSE); if (menustack[0] || pausedelay < 0 || leveltime < 2) return true; diff --git a/src/g_game.h b/src/g_game.h index 03409a2ec..c33b7cde2 100644 --- a/src/g_game.h +++ b/src/g_game.h @@ -69,7 +69,6 @@ extern INT32 gameovertics; extern UINT8 ammoremovaltics; extern tic_t timeinmap; // Ticker for time spent in level (used for levelcard display) extern INT32 pausedelay; -extern boolean pausebreakkey; extern boolean promptactive; diff --git a/src/g_input.c b/src/g_input.c index 6a4a278fa..48f497202 100644 --- a/src/g_input.c +++ b/src/g_input.c @@ -164,7 +164,7 @@ INT32 gamecontroldefault[num_gamecontrols][MAXINPUTMAPPING] = { [gc_lookback ] = {KEY_LSHIFT, KEY_JOY1+2 }, // North [gc_horncode ] = {'r', KEY_JOY1+8 }, // R-Stick Click - [gc_pause ] = {KEY_PAUSE, KEY_JOY1+4 }, // Back + [gc_pause ] = {KEY_PAUSE }, // Back [gc_systemmenu ] = { KEY_JOY1+6 }, // Start [gc_console ] = {KEY_CONSOLE }, [gc_screenshot ] = {KEY_F8 }, diff --git a/src/hu_stuff.c b/src/hu_stuff.c index 49f60622e..dd8307530 100644 --- a/src/hu_stuff.c +++ b/src/hu_stuff.c @@ -2052,7 +2052,7 @@ void HU_Drawer(void) V_DrawCenteredString(BASEVIDWIDTH/2, 180, V_YELLOWMAP | V_ALLOWLOWERCASE, resynch_text); } - if (modeattacking && pausedelay > 0 && !pausebreakkey) + if (modeattacking && pausedelay > 0) { INT32 strength = ((pausedelay - 1 - NEWTICRATE/2)*10)/(NEWTICRATE/3); INT32 x = BASEVIDWIDTH/2, y = BASEVIDHEIGHT/2; // obviously incorrect values while we scrap hudinfo diff --git a/src/m_menu.c b/src/m_menu.c index ad98339a4..461590d92 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -8644,7 +8644,7 @@ static void M_ChangecontrolResponse(event_t *ev) } // ESCAPE cancels; dummy out PAUSE - if (ch != KEY_ESCAPE && ch != KEY_PAUSE) + if (ch != KEY_ESCAPE) { // keypad arrows are converted for the menu in cursor arrows // so use the event instead of ch @@ -8685,23 +8685,23 @@ static void M_ChangecontrolResponse(event_t *ev) } S_StartSound(NULL, sfx_s221); } - else if (ch == KEY_PAUSE) - { - // This buffer assumes a 125-character message plus a 32-character control name (per controltochangetext buffer size) - static char tmp[158]; + // else if (ch == KEY_PAUSE) + // { + // // This buffer assumes a 125-character message plus a 32-character control name (per controltochangetext buffer size) + // static char tmp[158]; - if (controltochange == gc_pause) - sprintf(tmp, M_GetText("The \x82Pause Key \x80is enabled, but \nyou may select another key. \n\nHit another key for\n%s\nESC for Cancel"), - controltochangetext); - else - sprintf(tmp, M_GetText("The \x82Pause Key \x80is enabled, but \nit is not configurable. \n\nHit another key for\n%s\nESC for Cancel"), - controltochangetext); + // if (controltochange == gc_pause) + // sprintf(tmp, M_GetText("The \x82Pause Key \x80is enabled, but \nyou may select another key. \n\nHit another key for\n%s\nESC for Cancel"), + // controltochangetext); + // else + // sprintf(tmp, M_GetText("The \x82Pause Key \x80is enabled, but \nit is not configurable. \n\nHit another key for\n%s\nESC for Cancel"), + // controltochangetext); - M_StartMessage(tmp, M_ChangecontrolResponse, MM_EVENTHANDLER); + // M_StartMessage(tmp, M_ChangecontrolResponse, MM_EVENTHANDLER); - S_StartSound(NULL, sfx_s3k42); - return; - } + // S_StartSound(NULL, sfx_s3k42); + // return; + // } else S_StartSound(NULL, sfx_s224);