diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-03-11 01:15:25 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-03-11 01:15:25 +0300 |
| commit | 3e68cc3b6a3e45c2c552b7cae6b34557bed96dbc (patch) | |
| tree | d57a55d9d3834d1d19b393aceaaead4489ed7a22 | |
| parent | 5459411ec64d09895f6a5a2944cf4215a3ea1c1a (diff) | |
| download | manaplus-3e68cc3b6a3e45c2c552b7cae6b34557bed96dbc.tar.gz manaplus-3e68cc3b6a3e45c2c552b7cae6b34557bed96dbc.tar.bz2 manaplus-3e68cc3b6a3e45c2c552b7cae6b34557bed96dbc.tar.xz manaplus-3e68cc3b6a3e45c2c552b7cae6b34557bed96dbc.zip | |
Fix removing old unused keys from main configuration file.
| -rw-r--r-- | src/configuration.cpp | 5 | ||||
| -rw-r--r-- | src/configuration.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/configuration.cpp b/src/configuration.cpp index 36a1a724f..54420a9f3 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -49,6 +49,7 @@ const std::string unusedKeys[] = { "AttackRange", "emoteshortcut0", + "screenshotDirectory2", "AttackRangeBorder", "AttackRangeBorderDelay", "AttackRangeBorderGradient", @@ -205,7 +206,6 @@ const std::string unusedKeys[] = "playerHomes", "remember", "screenshotDirectory", - "screenshotDirectory2", "" }; @@ -894,7 +894,8 @@ void Configuration::removeListeners(ConfigListener *const listener) void Configuration::removeOldKeys() { if (mOptions.find(unusedKeys[0]) != mOptions.end() - || mOptions.find(unusedKeys[1]) != mOptions.end()) + || mOptions.find(unusedKeys[1]) != mOptions.end() + || mOptions.find(unusedKeys[2]) != mOptions.end()) { int f = 0; while (unusedKeys[f] != "") diff --git a/src/configuration.h b/src/configuration.h index d6bcda348..b1875247b 100644 --- a/src/configuration.h +++ b/src/configuration.h @@ -225,6 +225,8 @@ class ConfigurationObject #endif }; +#define valTest(num) mStatsRe##num + /** * Configuration handler for reading (and writing). * |