summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerEmu/ControlGroup/Triggers.cpp
diff options
context:
space:
mode:
authorJMC47 <JMC4789@gmail.com>2019-04-09 19:30:26 -0400
committerGitHub <noreply@github.com>2019-04-09 19:30:26 -0400
commite10a472134fdf557ec35505eb5fb7c74ba9f2af7 (patch)
tree9593eb71abc3f724159693d46eb8504ede9529f0 /Source/Core/InputCommon/ControllerEmu/ControlGroup/Triggers.cpp
parent0b8ac0a22f2fcebb7cbd00bbb36fd0c89191d34a (diff)
parent5efb717873691fa42447ca0d9d9810b5ad501b42 (diff)
Merge pull request #7936 from jordan-woyak/numeric-setting-cleanup
InputCommon: Clean up how numeric settings are handled.
Diffstat (limited to 'Source/Core/InputCommon/ControllerEmu/ControlGroup/Triggers.cpp')
-rw-r--r--Source/Core/InputCommon/ControllerEmu/ControlGroup/Triggers.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Triggers.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Triggers.cpp
index f950e5b24c..e4a359eeba 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Triggers.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Triggers.cpp
@@ -18,13 +18,13 @@ namespace ControllerEmu
{
Triggers::Triggers(const std::string& name_) : ControlGroup(name_, GroupType::Triggers)
{
- numeric_settings.emplace_back(std::make_unique<NumericSetting>(_trans("Dead Zone"), 0, 0, 50));
+ AddDeadzoneSetting(&m_deadzone_setting, 50);
}
Triggers::StateData Triggers::GetState()
{
const size_t trigger_count = controls.size();
- const ControlState deadzone = numeric_settings[0]->GetValue();
+ const ControlState deadzone = m_deadzone_setting.GetValue() / 100;
StateData result(trigger_count);
for (size_t i = 0; i < trigger_count; ++i)