From 649e49c9e23a6c2ee4d10958c7cbaed034ced018 Mon Sep 17 00:00:00 2001
From: Jordan Woyak <jordan.woyak@gmail.com>
Date: Tue, 5 Nov 2024 19:22:30 -0600
Subject: ControllerEmu: Remove nunchuk stick data hax.

---
 .../Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp  | 9 ---------
 Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.h | 1 -
 2 files changed, 10 deletions(-)

(limited to 'Source/Core/InputCommon/ControllerEmu')

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
@@ -50,13 +50,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)
@@ -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;
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.h b/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.h
index 377e63251d..5e913029ad 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.h
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.h
@@ -22,7 +22,6 @@ public:
 
   StateData GetState() const;
   StateData GetState(const InputOverrideFunction& override_func) const;
-  StateData GetState(const InputOverrideFunction& override_func, bool* override_occurred) const;
 
 private:
   Control* GetModifierInput() const override;
-- 
cgit v1.2.3