incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove the special cases related to the PAUSE key

Browse source 
don't get why these exist
This commit is contained in:
minenice55 2026-04-19 21:41:49 -04:00
parent f2a3b38f1e
commit 73768b0fc4
5 changed files with 17 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/g_game.c
View file

@ -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;

1
src/g_game.h
View file

@ -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;

2
src/g_input.c
View file

@ -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 },

2
src/hu_stuff.c
View file

@ -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

30
src/m_menu.c
View file

@ -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);