From 0f25d6e3defc9a6cd1cc2cd23b522abf8734c837 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 6 Oct 2013 13:27:37 +0300
Subject: Dont shop "did you know" window by default on Android.

---
 src/client.cpp   |  8 +++++++-
 src/defaults.cpp | 12 +++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/client.cpp b/src/client.cpp
index c2b0ad8fb..d5623a7f2 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -3134,8 +3134,14 @@ void Client::checkConfigVersion()
         config.setValue("customcursor", false);
 #endif
     }
+    if (version < 4)
+    {
+#ifdef ANDROID
+        config.setValue("showDidYouKnow", false);
+#endif
+    }
 
-    config.setValue("cfgver", 3);
+    config.setValue("cfgver", 4);
 }
 
 Window *Client::openErrorDialog(const std::string &header,
diff --git a/src/defaults.cpp b/src/defaults.cpp
index 02c0b8cbe..c1d1d2927 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -116,6 +116,8 @@ DefaultsData* getConfigDefaults()
     AddDEF("fpslimit", 100);
     AddDEF("theme", "jewelry");
     AddDEF("showChatColorsList", false);
+    AddDEF("customcursor", false);
+    AddDEF("showDidYouKnow", false);
 #else
     AddDEF("screenwidth", defaultScreenWidth);
     AddDEF("screenheight", defaultScreenHeight);
@@ -127,6 +129,8 @@ DefaultsData* getConfigDefaults()
     AddDEF("fpslimit", 60);
     AddDEF("theme", "");
     AddDEF("showChatColorsList", true);
+    AddDEF("customcursor", true);
+    AddDEF("showDidYouKnow", true);
 #endif
     AddDEF("screen", false);
     AddDEF("hwaccel", false);
@@ -153,11 +157,6 @@ DefaultsData* getConfigDefaults()
     AddDEF("ChatLogLength", 0);
     AddDEF("enableChatLog", true);
     AddDEF("whispertab", true);
-#ifdef ANDROID
-    AddDEF("customcursor", false);
-#else
-    AddDEF("customcursor", true);
-#endif
     AddDEF("showownname", true);
     AddDEF("showpickupparticle", true);
     AddDEF("showpickupchat", true);
@@ -225,7 +224,6 @@ DefaultsData* getConfigDefaults()
     AddDEF("securetrades", true);
     AddDEF("unsecureChars", "IO0@#$");
     AddDEF("currentTip", 0);
-    AddDEF("showDidYouKnow", true);
     AddDEF("useLocalTime", false);
     AddDEF("enableAdvert", true);
     AddDEF("enableMapReduce", true);
@@ -337,7 +335,7 @@ DefaultsData* getConfigDefaults()
     AddDEF("uselonglivesprites", false);
     AddDEF("uselonglivesounds", true);
     AddDEF("screenDensity", 0);
-    AddDEF("cfgver", 3);
+    AddDEF("cfgver", 4);
     AddDEF("enableDebugLog", false);
     AddDEF("doubleClick", true);
     AddDEF("useDiagonalSpeed", true);
-- 
cgit v1.2.3-70-g09d2