From 32b110efa9f22c8545d0b328b8afe769c1cfeb9c Mon Sep 17 00:00:00 2001
From: somewhatlurker <52014015+somewhatlurker@users.noreply.github.com>
Date: Wed, 23 Oct 2019 04:52:39 +1100
Subject: [PATCH] pause: better input filtering buttons now need to be pressed
 again after leaving pause to trigger (instead of instantly hitting when
 unpaused)

---
 .../source/plugins/TLAC/Components/Pause.cpp  | 25 ++++++++++++-------
 .../source/plugins/TLAC/Components/Pause.h    |  3 +++
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/source-code/source/plugins/TLAC/Components/Pause.cpp b/source-code/source/plugins/TLAC/Components/Pause.cpp
index ad7eca4..5ef1689 100644
--- a/source-code/source/plugins/TLAC/Components/Pause.cpp
+++ b/source-code/source/plugins/TLAC/Components/Pause.cpp
@@ -26,6 +26,7 @@ namespace TLAC::Components
 	bool(*divaGiveUpFunc)(void*) = (bool(*)(void* cls))GIVEUP_FUNC_ADDRESS;
 	InputState* Pause::inputState;
 	PlayerData* Pause::playerData;
+	JvsButtons Pause::filteredButtons;
 
 	Pause::Pause()
 	{
@@ -94,6 +95,9 @@ namespace TLAC::Components
 					*playstate = 0;
 				}
 
+				// block all buttons from being passed to game
+				filteredButtons = allButtons;
+
 				menuPos = 0;
 				menuSet = MENUSET_MAIN;
 				showUI = true;
@@ -169,15 +173,6 @@ namespace TLAC::Components
 						delete[] buf;
 					}
 				}
-
-
-				// swallow all button inputs if paused
-				inputState->Tapped.Buttons = JVS_NONE;
-				inputState->DoubleTapped.Buttons = JVS_NONE;
-				inputState->Down.Buttons = JVS_NONE;
-				inputState->Released.Buttons = JVS_NONE;
-				inputState->IntervalTapped.Buttons = JVS_NONE;
-				// todo: slider
 			}
 		}
 		else
@@ -208,6 +203,9 @@ namespace TLAC::Components
 				isPaused = false;
 			}
 
+			// buttons that have been tapped no longer need to be filtered (doing this with down broke retriggering)
+			filteredButtons = (JvsButtons)(filteredButtons & ~inputState->Tapped.Buttons);
+
 			// only enter pause if in game
 			if (*(GameState*)CURRENT_GAME_STATE_ADDRESS == GS_GAME && *(SubGameState*)CURRENT_GAME_SUB_STATE_ADDRESS == SUB_GAME_MAIN)
 			{
@@ -217,6 +215,15 @@ namespace TLAC::Components
 				}
 			}
 		}
+
+
+		// swallow filtered button inputs
+		inputState->Tapped.Buttons = (JvsButtons)(inputState->Tapped.Buttons & ~filteredButtons);
+		inputState->DoubleTapped.Buttons = (JvsButtons)(inputState->DoubleTapped.Buttons & ~filteredButtons);
+		inputState->Down.Buttons = (JvsButtons)(inputState->Down.Buttons & ~filteredButtons);
+		inputState->Released.Buttons = (JvsButtons)(inputState->Released.Buttons & ~filteredButtons);
+		inputState->IntervalTapped.Buttons = (JvsButtons)(inputState->IntervalTapped.Buttons & ~filteredButtons);
+		// todo: slider
 	}
 
 	void Pause::UpdateDraw2D()
diff --git a/source-code/source/plugins/TLAC/Components/Pause.h b/source-code/source/plugins/TLAC/Components/Pause.h
index bc7a782..4c4253b 100644
--- a/source-code/source/plugins/TLAC/Components/Pause.h
+++ b/source-code/source/plugins/TLAC/Components/Pause.h
@@ -47,6 +47,9 @@ namespace TLAC::Components
 		static PlayerData* playerData;
 		static InputState* inputState;
 
+		static const JvsButtons allButtons = (JvsButtons)(JVS_START | JVS_TRIANGLE | JVS_SQUARE | JVS_CROSS | JVS_CIRCLE | JVS_L | JVS_R); // deliberately only has control panel buttons
+		static JvsButtons filteredButtons;
+
 		static const int menuX = 640;
 		static const int menuY = 360;
 		static const int menuItemHeight = 36;