diff options
| author | lubomyr | 2017-02-18 18:02:46 +0200 |
|---|---|---|
| committer | lubomyr | 2017-02-18 18:02:46 +0200 |
| commit | 3f921c1195e1a998d7dc0c423bf7eb4c9549c78f (patch) | |
| tree | ec8bcb3915b6b7fb0f94d1eb7b0a0609e2a0ac9f | |
| parent | 75a08488f91117ee9f7f02163900a2dfd05758ad (diff) | |
| download | scummvm-rg350-3f921c1195e1a998d7dc0c423bf7eb4c9549c78f.tar.gz scummvm-rg350-3f921c1195e1a998d7dc0c423bf7eb4c9549c78f.tar.bz2 scummvm-rg350-3f921c1195e1a998d7dc0c423bf7eb4c9549c78f.zip | |
ANDROIDSDL: config feature swap_menu_and_back renamed to swap_menu_and_back_buttons
| -rw-r--r-- | backends/platform/androidsdl/androidsdl-sdl.cpp | 10 | ||||
| -rw-r--r-- | gui/options.cpp | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/backends/platform/androidsdl/androidsdl-sdl.cpp b/backends/platform/androidsdl/androidsdl-sdl.cpp index 00aed70f9f..f33f9b7bbc 100644 --- a/backends/platform/androidsdl/androidsdl-sdl.cpp +++ b/backends/platform/androidsdl/androidsdl-sdl.cpp @@ -45,10 +45,10 @@ void OSystem_ANDROIDSDL::initBackend() { if (!ConfMan.hasKey("gfx_mode")) ConfMan.set("gfx_mode", "2x"); - if (!ConfMan.hasKey("swap_menu_and_back")) - ConfMan.setBool("swap_menu_and_back", true); + if (!ConfMan.hasKey("swap_menu_and_back_buttons")) + ConfMan.setBool("swap_menu_and_back_buttons", true); else - swapMenuAndBackButtons(ConfMan.getBool("swap_menu_and_back")); + swapMenuAndBackButtons(ConfMan.getBool("swap_menu_and_back_buttons")); if (!ConfMan.hasKey("touchpad_mouse_mode")) { const bool enable = SDL_ANDROID_GetMouseEmulationMode(); @@ -111,7 +111,7 @@ void OSystem_ANDROIDSDL::setFeatureState(Feature f, bool enable) { showOnScreenControl(enable); break; case kFeatureSwapMenuAndBackButtons: - ConfMan.setBool("swap_menu_and_back", enable); + ConfMan.setBool("swap_menu_and_back_buttons", enable); swapMenuAndBackButtons(enable); break; } @@ -128,7 +128,7 @@ bool OSystem_ANDROIDSDL::getFeatureState(Feature f) { return ConfMan.getBool("onscreen_control"); break; case kFeatureSwapMenuAndBackButtons: - return ConfMan.getBool("swap_menu_and_back"); + return ConfMan.getBool("swap_menu_and_back_buttons"); break; default: return OSystem_POSIX::getFeatureState(f); diff --git a/gui/options.cpp b/gui/options.cpp index 056476f170..9fe93b4007 100644 --- a/gui/options.cpp +++ b/gui/options.cpp @@ -223,7 +223,7 @@ void OptionsDialog::build() { } } if (g_system->hasFeature(OSystem::kFeatureSwapMenuAndBackButtons)) { - if (ConfMan.hasKey("swap_menu_and_back", _domain)) { + if (ConfMan.hasKey("swap_menu_and_back_buttons", _domain)) { bool state = g_system->getFeatureState(OSystem::kFeatureSwapMenuAndBackButtons); if (_swapMenuAndBackBtnsCheckbox != 0) _swapMenuAndBackBtnsCheckbox->setState(state); @@ -420,7 +420,7 @@ void OptionsDialog::apply() { } } if (g_system->hasFeature(OSystem::kFeatureSwapMenuAndBackButtons)) { - if (ConfMan.getBool("swap_menu_and_back", _domain) != _swapMenuAndBackBtnsCheckbox->getState()) { + if (ConfMan.getBool("swap_menu_and_back_buttons", _domain) != _swapMenuAndBackBtnsCheckbox->getState()) { g_system->setFeatureState(OSystem::kFeatureSwapMenuAndBackButtons, _swapMenuAndBackBtnsCheckbox->getState()); } } |