summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2018-07-13 11:49:05 -0400
committerLioncash <mathew1800@gmail.com>2018-07-13 13:20:35 -0400
commit918d448b5bf1510b75e50f560f41fb9e2aae439c (patch)
tree32a2e74056f26989d31bdeb6eb9f19751198e1f0 /Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp
parent4c30b9e14dfbebe6a0c1131e3a5a19410b2dcdcd (diff)
ControlGroup/Slider: Return state data by value
Makes it less error-prone to get state data from sliders (no need to pass any locals), and also allows direct assignment, letting the retrieved data be const.
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