aboutsummaryrefslogtreecommitdiff
path: root/gui
diff options
context:
space:
mode:
authorBastien Bouclet2017-12-19 06:26:47 +0100
committerBastien Bouclet2017-12-26 21:11:04 +0100
commitee4ff8ca08faf2bfbc14fe4a905b311d48049cf6 (patch)
tree20bcd91fad47bf8868c3f3a14e39f6b21a962e1f /gui
parent1fb748e97480dc64ed27ebe75490c1b938cdbed4 (diff)
downloadscummvm-rg350-ee4ff8ca08faf2bfbc14fe4a905b311d48049cf6.tar.gz
scummvm-rg350-ee4ff8ca08faf2bfbc14fe4a905b311d48049cf6.tar.bz2
scummvm-rg350-ee4ff8ca08faf2bfbc14fe4a905b311d48049cf6.zip
SDL: Cleanup joystick deadzone handling
Diffstat (limited to 'gui')
-rw-r--r--gui/options.cpp20
1 files changed, 8 insertions, 12 deletions
diff --git a/gui/options.cpp b/gui/options.cpp
index f1ca21a90d..0ffcee4f87 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -240,21 +240,17 @@ void OptionsDialog::build() {
}
}
if (g_system->hasFeature(OSystem::kFeatureKbdMouseSpeed)) {
- if (ConfMan.hasKey("kbdmouse_speed", _domain)) {
- int value = ConfMan.getInt("kbdmouse_speed", _domain);
- if (_kbdMouseSpeedSlider && value < ARRAYSIZE(kbdMouseSpeedLabels) - 1 && value >= 0) {
- _kbdMouseSpeedSlider->setValue(value);
- _kbdMouseSpeedLabel->setLabel(_(kbdMouseSpeedLabels[value]));
- }
+ int value = ConfMan.getInt("kbdmouse_speed", _domain);
+ if (_kbdMouseSpeedSlider && value < ARRAYSIZE(kbdMouseSpeedLabels) - 1 && value >= 0) {
+ _kbdMouseSpeedSlider->setValue(value);
+ _kbdMouseSpeedLabel->setLabel(_(kbdMouseSpeedLabels[value]));
}
}
if (g_system->hasFeature(OSystem::kFeatureJoystickDeadzone)) {
- if (ConfMan.hasKey("joystick_deadzone", _domain)) {
- int value = ConfMan.getInt("joystick_deadzone", _domain);
- if (_joystickDeadzoneSlider != 0) {
- _joystickDeadzoneSlider->setValue(value);
- _joystickDeadzoneLabel->setValue(value);
- }
+ int value = ConfMan.getInt("joystick_deadzone", _domain);
+ if (_joystickDeadzoneSlider != 0) {
+ _joystickDeadzoneSlider->setValue(value);
+ _joystickDeadzoneLabel->setValue(value);
}
}