diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-09-11 20:04:10 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-09-11 20:04:10 +0300 |
| commit | bbc86b94fbe27e2ed4c05e7c2ac42037338e961e (patch) | |
| tree | b16704b23d99aed5cabe51ba2a0f80fb48d32cb0 | |
| parent | 5019ae8009921a95770959b5f5a92854203d2755 (diff) | |
| download | manaplus-bbc86b94fbe27e2ed4c05e7c2ac42037338e961e.tar.gz manaplus-bbc86b94fbe27e2ed4c05e7c2ac42037338e961e.tar.bz2 manaplus-bbc86b94fbe27e2ed4c05e7c2ac42037338e961e.tar.xz manaplus-bbc86b94fbe27e2ed4c05e7c2ac42037338e961e.zip | |
Remove support for legacy configuration in SpellManager.
| -rw-r--r-- | src/spellmanager.cpp | 8 | ||||
| -rw-r--r-- | src/spellmanager.h | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/spellmanager.cpp b/src/spellmanager.cpp index 79ec80a40..2020dae11 100644 --- a/src/spellmanager.cpp +++ b/src/spellmanager.cpp @@ -250,13 +250,9 @@ TextCommand *SpellManager::createNewSpell() const return new TextCommand(CAST_U32(mSpellsVector.size())); } -void SpellManager::load(const bool oldConfig) +void SpellManager::load() { - const Configuration *cfg; - if (oldConfig) - cfg = &config; - else - cfg = &serverConfig; + const Configuration *cfg = &serverConfig; delete_all(mSpells); mSpells.clear(); diff --git a/src/spellmanager.h b/src/spellmanager.h index 814cbf5db..809e9efa2 100644 --- a/src/spellmanager.h +++ b/src/spellmanager.h @@ -56,7 +56,7 @@ class SpellManager final void invoke(const int spellId) const; - void load(const bool oldConfig = false); + void load(); void save() const; |