Fix use, fire controls not working to advance intermission

bradharding · Jun 23, 2024 · 343477c · 343477c
1 parent d6e27d7
commit 343477c
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 10 deletions.
diff --git a/src/c_console.c b/src/c_console.c
@@ -804,7 +804,6 @@ void C_ShowConsole(bool reset)
     consoleanim = 0;
     showcaret = true;
     caretwait = 0;
-    skipaction = false;
 
     if (reset)
     {

diff --git a/src/g_game.c b/src/g_game.c
@@ -147,8 +147,6 @@ static bool     mousearray[MAXMOUSEBUTTONS + 1];
 bool            *mousebuttons = &mousearray[1]; // allow [-1]
 char            mouseactionlist[MAXMOUSEBUTTONS + 2][255] = { "" };
 
-bool            skipaction = false;
-
 static int      mousex;
 static int      mousey;
 
@@ -401,9 +399,7 @@ void G_BuildTiccmd(ticcmd_t *cmd)
         cmd->buttons |= BT_JUMP;
 
     // buttons
-    if (skipaction)
-        skipaction = false;
-    else if (!freeze)
+    if (!freeze)
     {
         if ((mousebuttons[mousefire] || gamekeydown[keyboardfire]
             || (gamecontrollerbuttons & gamecontrollerfire)))

diff --git a/src/g_game.h b/src/g_game.h
@@ -108,7 +108,6 @@ extern char         lbmpath2[MAX_PATH];
 extern char         keyactionlist[NUMKEYS][255];
 extern char         mouseactionlist[MAXMOUSEBUTTONS + 2][255];
 extern int          st_facecount;
-extern bool         skipaction;
 extern char         savename[MAX_PATH];
 extern bool         usefreelook;
 extern bool         secretexit;

diff --git a/src/m_menu.c b/src/m_menu.c
@@ -3879,9 +3879,8 @@ bool M_Responder(event_t *ev)
                 }
             }
 
-            skipaction = (currentmenu == &LoadDef || currentmenu == &SaveDef || currentmenu == &NewDef);
             keywait = I_GetTime() + 5;
-            return skipaction;
+            return (currentmenu == &LoadDef || currentmenu == &SaveDef || currentmenu == &NewDef);
         }
 
         else if ((key == keyboardmenu || key == KEY_BACKSPACE) && !keydown)

diff --git a/src/p_user.c b/src/p_user.c
@@ -390,7 +390,6 @@ static void P_DeathThink(void)
         damagerumbletics = 1;
         viewplayer->playerstate = PST_REBORN;
         facingkiller = false;
-        skipaction = true;
         gamekeydown[' '] = false;
         gamekeydown[KEY_ENTER] = false;