diff options
| author | Antoniou Athanasios | 2019-09-14 21:45:52 +0300 |
|---|---|---|
| committer | Antoniou Athanasios | 2019-09-14 21:50:49 +0300 |
| commit | 186dfd7bd53520f4d8dfcb505d89e2fe4b1c655c (patch) | |
| tree | 8e37a703b3a3e59cb21f54e1207494257ec4d53f | |
| parent | 6accd633b8f98f419ec02233d3dce5acc080a014 (diff) | |
| download | scummvm-rg350-186dfd7bd53520f4d8dfcb505d89e2fe4b1c655c.tar.gz scummvm-rg350-186dfd7bd53520f4d8dfcb505d89e2fe4b1c655c.tar.bz2 scummvm-rg350-186dfd7bd53520f4d8dfcb505d89e2fe4b1c655c.zip | |
ANDROIDSDL: Remove warning about unhandled kFeature
The fix is borrowed from the Switch backend
| -rw-r--r-- | backends/platform/androidsdl/androidsdl-sdl.cpp | 60 |
1 files changed, 34 insertions, 26 deletions
diff --git a/backends/platform/androidsdl/androidsdl-sdl.cpp b/backends/platform/androidsdl/androidsdl-sdl.cpp index 2ed644ecb2..93da9d42b5 100644 --- a/backends/platform/androidsdl/androidsdl-sdl.cpp +++ b/backends/platform/androidsdl/androidsdl-sdl.cpp @@ -102,41 +102,49 @@ void OSystem_ANDROIDSDL::switchToRelativeMouseMode() { void OSystem_ANDROIDSDL::setFeatureState(Feature f, bool enable) { switch (f) { - case kFeatureTouchpadMode: - ConfMan.setBool("touchpad_mouse_mode", enable); - touchpadMode(enable); - break; - case kFeatureOnScreenControl: - ConfMan.setBool("onscreen_control", enable); - showOnScreenControl(enable); - break; - case kFeatureSwapMenuAndBackButtons: - ConfMan.setBool("swap_menu_and_back_buttons", enable); - swapMenuAndBackButtons(enable); - break; + case kFeatureTouchpadMode: + ConfMan.setBool("touchpad_mouse_mode", enable); + touchpadMode(enable); + break; + case kFeatureOnScreenControl: + ConfMan.setBool("onscreen_control", enable); + showOnScreenControl(enable); + break; + case kFeatureSwapMenuAndBackButtons: + ConfMan.setBool("swap_menu_and_back_buttons", enable); + swapMenuAndBackButtons(enable); + break; + case kFeatureFullscreenMode: + break; + default: + OSystem_POSIX::setFeatureState(f, enable); + break; } - - OSystem_POSIX::setFeatureState(f, enable); } bool OSystem_ANDROIDSDL::getFeatureState(Feature f) { switch (f) { - case kFeatureTouchpadMode: - return ConfMan.getBool("touchpad_mouse_mode"); - break; - case kFeatureOnScreenControl: - return ConfMan.getBool("onscreen_control"); - break; - case kFeatureSwapMenuAndBackButtons: - return ConfMan.getBool("swap_menu_and_back_buttons"); - break; - default: - return OSystem_POSIX::getFeatureState(f); - break; + case kFeatureTouchpadMode: + return ConfMan.getBool("touchpad_mouse_mode"); + break; + case kFeatureOnScreenControl: + return ConfMan.getBool("onscreen_control"); + break; + case kFeatureSwapMenuAndBackButtons: + return ConfMan.getBool("swap_menu_and_back_buttons"); + break; + case kFeatureFullscreenMode: + return true; + break; + default: + return OSystem_POSIX::getFeatureState(f); + break; } } bool OSystem_ANDROIDSDL::hasFeature(Feature f) { + if (f == kFeatureFullscreenMode) + return false; return (f == kFeatureTouchpadMode || f == kFeatureOnScreenControl || f == kFeatureSwapMenuAndBackButtons || |