From 9c1b552de879776dbc963717753913548d6a82d7 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 8 Dec 2014 21:01:50 +0300
Subject: Umassign default value for attack key.

---
 src/configmanager.cpp | 11 ++++++++++-
 src/defaults.cpp      |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/configmanager.cpp b/src/configmanager.cpp
index 64916ee4f..9fc99dc1f 100644
--- a/src/configmanager.cpp
+++ b/src/configmanager.cpp
@@ -338,7 +338,16 @@ void ConfigManager::checkConfigVersion()
         unassignKey("keyDirectLeft", "k107");
         unassignKey("keyDirectRight", "k39");
     }
-    config.setValue("cfgver", 11);
+    if (version < 12)
+    {
+#ifdef USE_SDL2
+        const std::string prefix = std::string("sdl2");
+#else
+        const std::string prefix = std::string();
+#endif
+        unassignKey("keyAttack", "k120");
+    }
+    config.setValue("cfgver", 12);
 }
 
 #undef unassignKey
diff --git a/src/defaults.cpp b/src/defaults.cpp
index e11e6b897..9d865a647 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -352,7 +352,7 @@ DefaultsData* getConfigDefaults()
     AddDEF("uselonglivesprites", false);
     AddDEF("uselonglivesounds", true);
     AddDEF("screenDensity", 0);
-    AddDEF("cfgver", 11);
+    AddDEF("cfgver", 12);
     AddDEF("enableDebugLog", false);
     AddDEF("doubleClick", true);
     AddDEF("useDiagonalSpeed", true);
-- 
cgit v1.2.3-70-g09d2