diff options
| author | Léo Lam <leo@leolam.fr> | 2019-01-16 21:33:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-16 21:33:05 +0100 |
| commit | e19ee2ad4f8159a9e8f630c8ebc319c748527da8 (patch) | |
| tree | 4d827715af1bac19b0aa3fdbbf34a5d95bc3e5de /Source/Core/InputCommon/ControllerEmu/ControlGroup/ModifySettingsButton.cpp | |
| parent | 3892c3ac481cdde5c9631ba0c8845660c7a95586 (diff) | |
| parent | df43fd94725ee1abda8eb0c69efcd116c48db399 (diff) | |
Merge pull request #7664 from jordan-woyak/kill-button-threshold
ControllerEmu: Killed the button group threshold setting.
Diffstat (limited to 'Source/Core/InputCommon/ControllerEmu/ControlGroup/ModifySettingsButton.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerEmu/ControlGroup/ModifySettingsButton.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/ModifySettingsButton.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/ModifySettingsButton.cpp index d4e8bfa024..83e2186d81 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/ModifySettingsButton.cpp +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/ModifySettingsButton.cpp @@ -41,14 +41,14 @@ void ModifySettingsButton::GetState() if (!associated_settings_toggle[i]) { // not toggled - associated_settings[i] = state > numeric_settings[0]->GetValue(); + associated_settings[i] = state > ACTIVATION_THRESHOLD; } else { // toggle (loading savestates does not en-/disable toggle) // after we passed the threshold, we en-/disable. but after that, we don't change it // anymore - if (!threshold_exceeded[i] && state > numeric_settings[0]->GetValue()) + if (!threshold_exceeded[i] && state > ACTIVATION_THRESHOLD) { associated_settings[i] = !associated_settings[i]; @@ -60,7 +60,7 @@ void ModifySettingsButton::GetState() threshold_exceeded[i] = true; } - if (state < numeric_settings[0]->GetValue()) + if (state < ACTIVATION_THRESHOLD) threshold_exceeded[i] = false; } } |
