diff options
| author | Tilka <tilkax@gmail.com> | 2020-02-10 00:05:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-10 00:05:10 +0000 |
| commit | db65b9a766fd443eac48ced8e7693ef23b39e83e (patch) | |
| tree | e428c2563bb014968679e59c447ce3eb62a7b830 /Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp | |
| parent | e00459f68fd53b6a4d30800ce0548e459b141e5e (diff) | |
| parent | f07457b6ccb0ef6773b08c0e494df28a29c1b3e6 (diff) | |
Merge pull request #8616 from jordan-woyak/threshold-cleanup
InputCommon: Eliminate some duplicated button threshold logic.
Diffstat (limited to 'Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp index 0b702b6657..912f18b1a6 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp @@ -32,7 +32,7 @@ Slider::Slider(const std::string& name_) : Slider(name_, name_) Slider::StateData Slider::GetState() { const ControlState deadzone = m_deadzone_setting.GetValue() / 100; - const ControlState state = controls[1]->control_ref->State() - controls[0]->control_ref->State(); + const ControlState state = controls[1]->GetState() - controls[0]->GetState(); return {std::clamp(ApplyDeadzone(state, deadzone), -1.0, 1.0)}; } |
