From c09113fe5d46feb56954fe6e43ef84a5001aa650 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 3 Nov 2012 16:45:58 +0300 Subject: Disable video mode testing under Android. Also disable fallback resolution 640x480 for Android. --- src/client.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src/client.cpp') diff --git a/src/client.cpp b/src/client.cpp index 878dd9360..5bc891948 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -528,7 +528,7 @@ void Client::gameInit() } #endif -#ifdef USE_OPENGL +#if defined(USE_OPENGL) && !defined(ANDROID) if (!mOptions.safeMode && mOptions.test.empty() && !config.getBoolValue("videodetected")) { @@ -2115,8 +2115,13 @@ void Client::storeSafeParameters() const config.setValue("altfpslimit", 3); config.setValue("sound", false); config.setValue("safemode", true); +#ifdef ANDROID + config.setValue("screenwidth", 0); + config.setValue("screenheight", 0); +#else config.setValue("screenwidth", 640); config.setValue("screenheight", 480); +#endif config.setValue("font", "fonts/dejavusans.ttf"); config.setValue("boldFont", "fonts/dejavusans-bold.ttf"); config.setValue("particleFont", "fonts/dejavusans.ttf"); @@ -2131,8 +2136,13 @@ void Client::storeSafeParameters() const { // if video mode not configured reset only video mode to safe config.setValue("opengl", 0); +#ifdef ANDROID + config.setValue("screenwidth", 0); + config.setValue("screenheight", 0); +#else config.setValue("screenwidth", 640); config.setValue("screenheight", 480); +#endif } config.write(); -- cgit v1.2.3-60-g2f50