From f07457b6ccb0ef6773b08c0e494df28a29c1b3e6 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sat, 8 Feb 2020 20:36:26 -0600 Subject: InputCommon: Eliminate some duplicated button threshold logic. --- Source/Core/InputCommon/ControllerEmu/ControlGroup/MixedTriggers.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/Core/InputCommon/ControllerEmu/ControlGroup/MixedTriggers.cpp') 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) -- cgit v1.2.3