Merge pull request #13177 from jordan-woyak/remove-nunchuk-hax

ControllerEmu: Remove nunchuk stick data hax.

1 files changed, 0 insertions, 9 deletions

diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp
index c26f143f1c..7cc204ab10 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp
@@ -51,13 +51,6 @@ AnalogStick::StateData AnalogStick::GetState() const
 
 AnalogStick::StateData AnalogStick::GetState(const InputOverrideFunction& override_func) const
 {
-  bool override_occurred = false;
-  return GetState(override_func, &override_occurred);
-}
-
-AnalogStick::StateData AnalogStick::GetState(const InputOverrideFunction& override_func,
-                                             bool* override_occurred) const
-{
   StateData state = GetState();
   if (!override_func)
     return state;
@@ -65,13 +58,11 @@ AnalogStick::StateData AnalogStick::GetState(const InputOverrideFunction& overri
   if (const std::optional<ControlState> x_override = override_func(name, X_INPUT_OVERRIDE, state.x))
   {
     state.x = *x_override;
-    *override_occurred = true;
   }
 
   if (const std::optional<ControlState> y_override = override_func(name, Y_INPUT_OVERRIDE, state.y))
   {
     state.y = *y_override;
-    *override_occurred = true;
   }
 
   return state;