summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp
diff options
context:
space:
mode:
authorLéo Lam <leo@innovatetechnologi.es>2018-09-16 16:04:21 +0200
committerGitHub <noreply@github.com>2018-09-16 16:04:21 +0200
commite90bd035cb3b7d3bc02058bdeb19b11ddca126b3 (patch)
tree0a55bf69aae1b794e5727ce42fd989a99d6b96f1 /Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp
parent40b7fab235a86e904086c25dc256398f956c21bc (diff)
parent9983d92981cf3ad27b75720d2f12fe90667180db (diff)
Merge pull request #7262 from lioncash/force
ControlGroup: Return state data via GetState() by value where applicable
Diffstat (limited to 'Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp')
-rw-r--r--Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp
index 6784f6e24e..f7e20dc386 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp
@@ -30,14 +30,14 @@ Slider::Slider(const std::string& name_) : Slider(name_, name_)
{
}
-void Slider::GetState(ControlState* const slider)
+Slider::StateData Slider::GetState()
{
const ControlState deadzone = numeric_settings[0]->GetValue();
const ControlState state = controls[1]->control_ref->State() - controls[0]->control_ref->State();
if (fabs(state) > deadzone)
- *slider = (state - (deadzone * sign(state))) / (1 - deadzone);
- else
- *slider = 0;
+ return {(state - (deadzone * sign(state))) / (1 - deadzone)};
+
+ return {0.0};
}
} // namespace ControllerEmu