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/MixedTriggers.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/MixedTriggers.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerEmu/ControlGroup/MixedTriggers.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/MixedTriggers.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/MixedTriggers.cpp index 4cd8df7874..50a787b41d 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/MixedTriggers.cpp +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/MixedTriggers.cpp @@ -46,9 +46,9 @@ void MixedTriggers::GetState(u16* const digital, const u16* bitmasks, ControlSta const int trigger_count = int(controls.size() / 2); for (int i = 0; i != trigger_count; ++i) { - const ControlState button_value = ApplyDeadzone(controls[i]->control_ref->State(), deadzone); + const ControlState button_value = ApplyDeadzone(controls[i]->GetState(), deadzone); ControlState analog_value = - std::min(ApplyDeadzone(controls[trigger_count + i]->control_ref->State(), deadzone), 1.0); + std::min(ApplyDeadzone(controls[trigger_count + i]->GetState(), deadzone), 1.0); // Apply threshold: if (button_value > threshold) |
