Change wheel's toggle mod button to delay

JustPressed returns true after mod is toggled and user hasn't magically removed their finger before the next tick. So it keeps enabling/disabling everything.
ikt32 · Sep 26, 2017 · 56907df · 56907df
1 parent de71467
commit 56907df
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/Gears/Input/ScriptControls.cpp b/Gears/Input/ScriptControls.cpp
@@ -426,12 +426,12 @@ bool ScriptControls::ButtonReleased(WheelControlType control) {
 	return false;
 }
 
-bool ScriptControls::ButtonHeld(WheelControlType control) {
+bool ScriptControls::ButtonHeld(WheelControlType control, int delay) {
 	if (!WheelControl.IsConnected(WheelButtonGUIDs[static_cast<int>(control)]) ||
 		WheelButton[static_cast<int>(control)] == -1) {
 		return false;
 	}
-	if (WheelControl.WasButtonHeldForMs(WheelButton[static_cast<int>(control)], WheelButtonGUIDs[static_cast<int>(control)], WButtonHeld))
+	if (WheelControl.WasButtonHeldForMs(WheelButton[static_cast<int>(control)], WheelButtonGUIDs[static_cast<int>(control)], delay))
 		return true;
 	return false;
 }

diff --git a/Gears/Input/ScriptControls.hpp b/Gears/Input/ScriptControls.hpp
@@ -174,7 +174,7 @@ class ScriptControls {
 	// Wheel controls
 	bool ButtonJustPressed(WheelControlType control);
 	bool ButtonReleased(WheelControlType control);
-	bool ButtonHeld(WheelControlType control);
+	bool ButtonHeld(WheelControlType control, int delay);
 	bool ButtonIn(WheelControlType control);
 	void CheckCustomButtons(bool justPeeking);
 	void StopForceFeedback();
@@ -201,7 +201,6 @@ class ScriptControls {
 	int SteerRight = 0;
 	int HandbrakeUp = 0;
 	int HandbrakeDown = 0;
-	int WButtonHeld = 1000;
 	int MaxTapTime = 200;
 
 	bool InvertSteer = false;

diff --git a/Gears/script.cpp b/Gears/script.cpp
@@ -142,7 +142,7 @@ void update() {
 	}
 
 	if (controls.ButtonJustPressed(ScriptControls::KeyboardControlType::Toggle) ||
-		controls.ButtonJustPressed(ScriptControls::WheelControlType::Toggle) ||
+		controls.ButtonHeld(ScriptControls::WheelControlType::Toggle, 500) ||
 		controls.ButtonHeld(ScriptControls::ControllerControlType::Toggle) ||
 		controls.PrevInput == ScriptControls::Controller	&& controls.ButtonHeld(ScriptControls::LegacyControlType::Toggle)) {
 		toggleManual();
@@ -1991,8 +1991,8 @@ void handleVehicleButtons() {
 	}
 
 
-	if (controls.ButtonHeld(ScriptControls::WheelControlType::RadioPrev) ||
-		controls.ButtonHeld(ScriptControls::WheelControlType::RadioNext)) {
+	if (controls.ButtonHeld(ScriptControls::WheelControlType::RadioPrev, 1000) ||
+		controls.ButtonHeld(ScriptControls::WheelControlType::RadioNext, 1000)) {
 		if (AUDIO::GET_PLAYER_RADIO_STATION_INDEX() != RadioOff) {
 			vehData.RadioStationIndex = AUDIO::GET_PLAYER_RADIO_STATION_INDEX();
 		}