summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-10-22 23:07:56 +0300
committerAndrei Karas <akaras@inbox.ru>2013-10-22 23:07:56 +0300
commit1a948b6772f440cda14f7cd526bd6e1555251d61 (patch)
treee6aa9f3c3ecd0658d4b3e7eaf18924f2e6761aa9
parente59016e16e555e1e4d143110c5857274f7b6b98c (diff)
downloadplus-1a948b6772f440cda14f7cd526bd6e1555251d61.tar.gz
plus-1a948b6772f440cda14f7cd526bd6e1555251d61.tar.bz2
plus-1a948b6772f440cda14f7cd526bd6e1555251d61.tar.xz
plus-1a948b6772f440cda14f7cd526bd6e1555251d61.zip
disable safe mode in Android.
-rw-r--r--src/client.cpp27
1 files changed, 7 insertions, 20 deletions
diff --git a/src/client.cpp b/src/client.cpp
index 01c114aff..a35a671f1 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -376,7 +376,9 @@ void Client::gameInit()
config.incValue("runcount");
+#ifndef ANDROID
storeSafeParameters();
+#endif
const ResourceManager *const resman = ResourceManager::getInstance();
if (!resman->setWriteDir(mLocalDataDir))
@@ -2348,24 +2350,11 @@ void Client::storeSafeParameters() const
{
// if video mode configured reset most settings to safe
config.setValue("hwaccel", false);
-
-#if defined(ANDROID)
- config.setValue("opengl", static_cast<int>(RENDER_GLES_OPENGL));
-#elif defined(__APPLE__)
- config.setValue("opengl", static_cast<int>(RENDER_NORMAL_OPENGL));
-#else
- config.setValue("opengl", static_cast<int>(RENDER_SOFTWARE));
-#endif
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");
@@ -2379,16 +2368,14 @@ void Client::storeSafeParameters() const
else
{
// if video mode not configured reset only video mode to safe
-#ifdef ANDROID
- config.setValue("screenwidth", 0);
- config.setValue("screenheight", 0);
- config.setValue("opengl", static_cast<int>(RENDER_GLES_OPENGL));
-#else
config.setValue("screenwidth", 640);
config.setValue("screenheight", 480);
- config.setValue("opengl", static_cast<int>(RENDER_SOFTWARE));
-#endif
}
+#if defined(__APPLE__)
+ config.setValue("opengl", static_cast<int>(RENDER_NORMAL_OPENGL));
+#else
+ config.setValue("opengl", static_cast<int>(RENDER_SOFTWARE));
+#endif
config.write();