diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-12-08 21:01:50 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-12-08 21:01:50 +0300 |
| commit | 9c1b552de879776dbc963717753913548d6a82d7 (patch) | |
| tree | 9e7902f445910d3d345afa88150002f2a222f8e2 | |
| parent | cb7e5cfdc0cf92d28661f37bbfa91b39ddb92028 (diff) | |
| download | plus-9c1b552de879776dbc963717753913548d6a82d7.tar.gz plus-9c1b552de879776dbc963717753913548d6a82d7.tar.bz2 plus-9c1b552de879776dbc963717753913548d6a82d7.tar.xz plus-9c1b552de879776dbc963717753913548d6a82d7.zip | |
Umassign default value for attack key.
| -rw-r--r-- | src/configmanager.cpp | 11 | ||||
| -rw-r--r-- | src/defaults.cpp | 2 |
2 files changed, 11 insertions, 2 deletions
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); |