Lock inputs after unpausing to prevent error inputs

cxong · Aug 11, 2024 · c52af7d · c52af7d
1 parent cf5fc8b
commit c52af7d
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 8 deletions.
diff --git a/src/cdogs/joystick.c b/src/cdogs/joystick.c
@@ -2,7 +2,7 @@
     C-Dogs SDL
     A port of the legendary (and fun) action/arcade cdogs.
 
-    Copyright (c) 2013-2015, 2018 Cong Xu
+    Copyright (c) 2013-2015, 2018, 2024 Cong Xu
     All rights reserved.
 
     Redistribution and use in source and binary forms, with or without
@@ -75,6 +75,13 @@ void JoyReset(CArray *joys)
 	CA_FOREACH_END()
 }
 
+void JoyLock(CArray *joys)
+{
+	CA_FOREACH(Joystick, j, *joys)
+		j->lockedCmd = j->currentCmd;
+	CA_FOREACH_END()
+}
+
 static void JoyTerminateOne(Joystick *j)
 {
 	SDL_GameControllerClose(j->gc);
@@ -99,7 +106,8 @@ static Joystick *GetJoystick(const SDL_JoystickID id)
 
 bool JoyIsDown(const SDL_JoystickID id, const int cmd)
 {
-	return !!(GetJoystick(id)->currentCmd & cmd);
+	const Joystick *j = GetJoystick(id);
+	return !!(j->currentCmd & ~j->lockedCmd & cmd);
 }
 
 bool JoyIsPressed(const SDL_JoystickID id, const int cmd)
@@ -277,6 +285,7 @@ static void JoyOnCmd(Joystick *j, const int cmd, const bool isDown)
 			j->pressedCmd |= cmd;
 		}
 		j->currentCmd &= ~cmd;
+		j->lockedCmd &= ~cmd;
 	}
 }
 

diff --git a/src/cdogs/joystick.h b/src/cdogs/joystick.h
@@ -2,7 +2,7 @@
     C-Dogs SDL
     A port of the legendary (and fun) action/arcade cdogs.
 
-    Copyright (c) 2013-2015, Cong Xu
+    Copyright (c) 2013-2015, 2024 Cong Xu
     All rights reserved.
 
     Redistribution and use in source and binary forms, with or without
@@ -48,10 +48,14 @@ typedef struct
 	int currentCmd;
 	int previousCmd;
 	int pressedCmd;
+	// When switching between states, lock cmds that were already down,
+	// and prevent isDown until they are released
+	int lockedCmd;
 } Joystick;
 
 void JoyInit(CArray *joys);
 void JoyReset(CArray *joys);
+void JoyLock(CArray *joys);
 void JoyTerminate(CArray *joys);
 
 bool JoyIsDown(const SDL_JoystickID id, const int cmd);

diff --git a/src/cdogs/keyboard.c b/src/cdogs/keyboard.c
@@ -2,7 +2,7 @@
     C-Dogs SDL
     A port of the legendary (and fun) action/arcade cdogs.
 
-    Copyright (c) 2013-2015, 2018, 2021 Cong Xu, davidrgmcb
+    Copyright (c) 2013-2015, 2018, 2021, 2024 Cong Xu, davidrgmcb
     All rights reserved.
 
     Redistribution and use in source and binary forms, with or without
@@ -82,6 +82,14 @@ InputKeys KeyLoadPlayerKeys(Config *c)
 	return k;
 }
 
+void KeyLockKeys(keyboard_t *k)
+{
+	memcpy(
+		k->lockedKeys,
+		k->currentKeys,
+		sizeof k->lockedKeys);
+}
+
 void KeyPrePoll(keyboard_t *keyboard)
 {
 	memcpy(
@@ -106,7 +114,8 @@ void KeyOnKeyDown(keyboard_t *keyboard, const SDL_Keysym s)
 }
 void KeyOnKeyUp(keyboard_t *keyboard, const SDL_Keysym s)
 {
-	keyboard->currentKeys[s.scancode].isPressed = 0;
+	keyboard->currentKeys[s.scancode].isPressed = false;
+	keyboard->lockedKeys[s.scancode].isPressed = false;
 }
 
 void DiagonalHold(keyboard_t *keyboard, int currentPlayer)
@@ -256,7 +265,7 @@ void KeyPostPoll(keyboard_t *keyboard, const Uint32 ticks)
 
 bool KeyIsDown(const keyboard_t *k, const int key)
 {
-	return k->currentKeys[key].isPressed;
+	return !k->lockedKeys[key].isPressed && k->currentKeys[key].isPressed;
 }
 
 bool KeyIsPressed(const keyboard_t *k, const int key)

diff --git a/src/cdogs/keyboard.h b/src/cdogs/keyboard.h
@@ -2,7 +2,7 @@
     C-Dogs SDL
     A port of the legendary (and fun) action/arcade cdogs.
 
-    Copyright (c) 2013-2015, 2018, 2021 Cong Xu
+    Copyright (c) 2013-2015, 2018, 2021, 2024 Cong Xu
     All rights reserved.
 
     Redistribution and use in source and binary forms, with or without
@@ -87,6 +87,9 @@ typedef struct
 	KeyPress previousKeys[SDL_NUM_SCANCODES];
 	KeyPress currentKeys[SDL_NUM_SCANCODES];
 	KeyPress pressedKeys[SDL_NUM_SCANCODES];
+	// When switching between states, lock keys that were already down,
+	// and prevent isDown until they are released
+	KeyPress lockedKeys[SDL_NUM_SCANCODES];
 	SDL_Keymod modState;
 	char Typed[32];
 	Uint32 repeatedTicks;
@@ -97,6 +100,7 @@ typedef struct
 
 void KeyInit(keyboard_t *keyboard);
 InputKeys KeyLoadPlayerKeys(Config *c);
+void KeyLockKeys(keyboard_t *k);
 void KeyPrePoll(keyboard_t *keyboard);
 void KeyOnKeyDown(keyboard_t *keyboard, const SDL_Keysym s);
 void KeyOnKeyUp(keyboard_t *keyboard, const SDL_Keysym s);

diff --git a/src/game.c b/src/game.c
@@ -359,7 +359,8 @@ static void RunGameInput(GameLoopData *data)
 		// Clear all user inputs if we're using the pause menu
 		memset(rData->cmds, 0, sizeof rData->cmds);
 		memset(rData->lastCmds, 0, sizeof rData->lastCmds);
-		// TODO: require a button up before allowing firing again
+		KeyLockKeys(&gEventHandlers.keyboard);
+		JoyLock(&gEventHandlers.joysticks);
 	}
 
 	// Update and check if we want to quit