diff options
| author | Admiral H. Curtiss <pikachu025@gmail.com> | 2025-08-01 22:00:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-08-01 22:00:17 +0200 |
| commit | bec5624287c82b0ba50937f20743c6415787dcfa (patch) | |
| tree | 9c9f13070e1bd5c43df07d1473ef76435b073137 /Source/Core/InputCommon/ControllerEmu | |
| parent | 3fb80bec9b947ae9690776bc0a0589ff2b36d1c1 (diff) | |
| parent | 649e49c9e23a6c2ee4d10958c7cbaed034ced018 (diff) | |
Merge pull request #13177 from jordan-woyak/remove-nunchuk-hax
ControllerEmu: Remove nunchuk stick data hax.
Diffstat (limited to 'Source/Core/InputCommon/ControllerEmu')
| -rw-r--r-- | Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp | 9 | ||||
| -rw-r--r-- | Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.h | 1 |
2 files changed, 0 insertions, 10 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; diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.h b/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.h index 09beffe728..0b71baf3c7 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; |