fix input debounce preference and stuff

etternagame · Mar 4, 2022 · 1a93c5c · 1a93c5c
1 parent 7196513
commit 1a93c5c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/Themes/Rebirth/BGAnimations/playerInfoFrame/settings.lua b/Themes/Rebirth/BGAnimations/playerInfoFrame/settings.lua
@@ -5396,9 +5396,9 @@ local function rightFrame()
                 Name = "Input Debounce Time",
                 Type = "SingleChoice",
                 Explanation = "Set the amount of time required between each repeated input.",
-                Directions = preferenceIncrementDecrementDirections("InputDebounceTime", 0, 1, 0.01),
+                Directions = preferenceIncrementDecrementDirections("InputDebounceTime", 0, 0.2, 0.001),
                 ChoiceIndexGetter = function()
-                    return notShit.round(PREFSMAN:GetPreference("InputDebounceTime"), 2) .. "s"
+                    return notShit.round(PREFSMAN:GetPreference("InputDebounceTime"), 3) .. "s"
                 end,
             },
             {

diff --git a/src/Etterna/Singletons/InputFilter.cpp b/src/Etterna/Singletons/InputFilter.cpp
@@ -274,15 +274,14 @@ InputFilter::CheckButtonChange(ButtonState& bs,
 
 	GameInput gi;
 
-	/* Possibly apply debounce,
-	 * If the input was coin, possibly apply distinct coin debounce in the else
-	 * below. */
+	// Possibly apply debounce
 	std::chrono::duration<float> timeDelta = now - bs.m_LastReportTime;
 	float delta = timeDelta.count();
-	if (!INPUTMAPPER->DeviceToGame(di, gi) && di.button != MOUSE_WHEELDOWN &&
-		di.button != MOUSE_WHEELUP) {
+	if (di.button != MOUSE_WHEELDOWN && di.button != MOUSE_WHEELUP) {
 		/* If the last IET_FIRST_PRESS or IET_RELEASE event was sent too
 		 * recently, wait a while before sending it. */
+		// note: a debounce time longer than the min IET_REPEAT time
+		// will cause repeat events to fire here
 		if (delta < g_fInputDebounceTime) {
 			return;
 		}