[Scummvm-git-logs] scummvm master -> 186dfd7bd53520f4d8dfcb505d89e2fe4b1c655c

[antoniou79]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
186dfd7bd5 ANDROIDSDL: Remove warning about unhandled kFeature


Commit: 186dfd7bd53520f4d8dfcb505d89e2fe4b1c655c
    https://github.com/scummvm/scummvm/commit/186dfd7bd53520f4d8dfcb505d89e2fe4b1c655c
Author: Antoniou Athanasios (stroggoff at gmail.com)
Date: 2019-09-14T21:50:49+03:00

Commit Message:
ANDROIDSDL: Remove warning about unhandled kFeature

The fix is borrowed from the Switch backend

Changed paths:
    backends/platform/androidsdl/androidsdl-sdl.cpp


diff --git a/backends/platform/androidsdl/androidsdl-sdl.cpp b/backends/platform/androidsdl/androidsdl-sdl.cpp
index 2ed644e..93da9d4 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 ||