diff options
| author | Mai M <mathew1800@gmail.com> | 2022-01-13 08:32:15 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-13 08:32:15 -0500 |
| commit | 1cea399e9c74aa82b89090b01d2d4dac4e6f39be (patch) | |
| tree | 066b3f96f26dfe9fbd291e2023405dff3ece02d3 /Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp | |
| parent | cfb8b9bcf4eee1f1352b8208e1334ee49282f414 (diff) | |
| parent | 78a9bdf04a5745472b4ea86962cfb75170c1c7ee (diff) | |
Merge pull request #10345 from jordan-woyak/modifier-range
InputCommon: Re-enable "Modifier" "Range" settings.
Diffstat (limited to 'Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp index b4b1accc77..aaabfa5b17 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp @@ -40,9 +40,7 @@ AnalogStick::ReshapeData AnalogStick::GetReshapableState(bool adjusted) const if (!adjusted) return {x, y}; - const ControlState modifier = controls[4]->GetState(); - - return Reshape(x, y, modifier); + return Reshape(x, y, GetModifierInput()->GetState()); } AnalogStick::StateData AnalogStick::GetState() const @@ -55,6 +53,11 @@ ControlState AnalogStick::GetGateRadiusAtAngle(double ang) const return m_stick_gate->GetRadiusAtAngle(ang); } +Control* AnalogStick::GetModifierInput() const +{ + return controls[4].get(); +} + OctagonAnalogStick::OctagonAnalogStick(const char* name_, ControlState gate_radius) : OctagonAnalogStick(name_, name_, gate_radius) { |