From 78a9bdf04a5745472b4ea86962cfb75170c1c7ee Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Tue, 4 Jan 2022 14:09:50 -0600 Subject: InputCommon: Use value of "Modifier" button "Range" setting rather than always applying 50%. Make "Clear" button reset "Modifier" "Range" settings to 50%. --- Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.cpp') diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.cpp index cd6ee91cbc..69a3038b42 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.cpp +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.cpp @@ -50,9 +50,7 @@ Tilt::ReshapeData Tilt::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()); } Tilt::StateData Tilt::GetState() const @@ -76,4 +74,9 @@ ControlState Tilt::GetMaxRotationalVelocity() const return m_max_rotational_velocity.GetValue() * MathUtil::TAU; } +Control* Tilt::GetModifierInput() const +{ + return controls[4].get(); +} + } // namespace ControllerEmu -- cgit v1.2.3