summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp
diff options
context:
space:
mode:
authorTilka <tilkax@gmail.com>2020-02-10 00:05:10 +0000
committerGitHub <noreply@github.com>2020-02-10 00:05:10 +0000
commitdb65b9a766fd443eac48ced8e7693ef23b39e83e (patch)
treee428c2563bb014968679e59c447ce3eb62a7b830 /Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp
parente00459f68fd53b6a4d30800ce0548e459b141e5e (diff)
parentf07457b6ccb0ef6773b08c0e494df28a29c1b3e6 (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/AnalogStick.cpp')
-rw-r--r--Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp
index 45d178ed17..df67930f9d 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp
@@ -34,14 +34,14 @@ AnalogStick::AnalogStick(const char* const name_, const char* const ui_name_,
AnalogStick::ReshapeData AnalogStick::GetReshapableState(bool adjusted)
{
- const ControlState y = controls[0]->control_ref->State() - controls[1]->control_ref->State();
- const ControlState x = controls[3]->control_ref->State() - controls[2]->control_ref->State();
+ const ControlState y = controls[0]->GetState() - controls[1]->GetState();
+ const ControlState x = controls[3]->GetState() - controls[2]->GetState();
// Return raw values. (used in UI)
if (!adjusted)
return {x, y};
- const ControlState modifier = controls[4]->control_ref->State();
+ const ControlState modifier = controls[4]->GetState();
return Reshape(x, y, modifier);
}