diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs index fe5d421d1c..8bf6329861 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.cs @@ -704,9 +704,7 @@ namespace BizHawk.Client.EmuHawk // ...but prepare haptics first, those get read in ProcessInput var finalHostController = (ControllerInputCoalescer) InputManager.ControllerInputCoalescer; // for now, vibrate the first gamepad when the Fast Forward hotkey is held, using the value from the previous (host) frame -#if false // waiting on https://github.com/TASVideos/BizHawk/pull/2683 InputManager.ActiveController.SetHapticChannelStrength("Debug", InputManager.ClientControls.IsPressed("Fast Forward") ? int.MaxValue : 0); -#endif InputManager.ActiveController.PrepareHapticsForHost(finalHostController); ProcessInput( _hotkeyCoalescer, diff --git a/src/BizHawk.Client.EmuHawk/config/ControllerConfig.cs b/src/BizHawk.Client.EmuHawk/config/ControllerConfig.cs index b1150cf701..47bc008bab 100644 --- a/src/BizHawk.Client.EmuHawk/config/ControllerConfig.cs +++ b/src/BizHawk.Client.EmuHawk/config/ControllerConfig.cs @@ -236,7 +236,6 @@ namespace BizHawk.Client.EmuHawk new AnalogBind("", 1.0f, 0.1f), CreateAnalogPanel ); -#if false // waiting on https://github.com/TASVideos/BizHawk/pull/2683 LoadToPanel( FeedbacksTab, _emulator.ControllerDefinition.Name, @@ -245,7 +244,6 @@ namespace BizHawk.Client.EmuHawk haptics, new(string.Empty, string.Empty, 1.0f), CreateFeedbacksPanel); -#endif if (AnalogControlsTab.Controls.Count == 0) {