diff options
author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-09-28 16:57:36 +0200 |
---|---|---|
committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-09-28 16:59:43 +0200 |
commit | 3e218fec3000ab36ce03a0e3a04756bff9484127 (patch) | |
tree | 38f0d3992af9f910e6454f0d32a63067be817218 /src/game-server | |
parent | 3a72ea3a61b812924be76e2a0bccd2882a8b06ce (diff) | |
download | manaserv-3e218fec3000ab36ce03a0e3a04756bff9484127.tar.gz manaserv-3e218fec3000ab36ce03a0e3a04756bff9484127.tar.bz2 manaserv-3e218fec3000ab36ce03a0e3a04756bff9484127.tar.xz manaserv-3e218fec3000ab36ce03a0e3a04756bff9484127.zip |
Clarified the role of initialize() and reload() functions in the monster
and item managers.
ack-by: o11c.
note: The managers still need to auto deinit when already loaded.
This will be done in another trivial commit.
Diffstat (limited to 'src/game-server')
-rw-r--r-- | src/game-server/itemmanager.cpp | 7 | ||||
-rw-r--r-- | src/game-server/monstermanager.cpp | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/game-server/itemmanager.cpp b/src/game-server/itemmanager.cpp index d21c791c..9d94c389 100644 --- a/src/game-server/itemmanager.cpp +++ b/src/game-server/itemmanager.cpp @@ -32,12 +32,13 @@ #include <set> #include <sstream> -void ItemManager::initialize() +void ItemManager::reload() { - reload(); + deinitialize(); + initialize(); } -void ItemManager::reload() +void ItemManager::initialize() { mVisibleEquipSlotCount = 0; readEquipSlotsFile(); diff --git a/src/game-server/monstermanager.cpp b/src/game-server/monstermanager.cpp index 581dfd04..b7efd003 100644 --- a/src/game-server/monstermanager.cpp +++ b/src/game-server/monstermanager.cpp @@ -52,12 +52,13 @@ Element elementFromString (const std::string &name) return val == table.end() ? ELEMENT_ILLEGAL : (*val).second; } -void MonsterManager::initialize() +void MonsterManager::reload() { - reload(); + deinitialize(); + initialize(); } -void MonsterManager::reload() +void MonsterManager::initialize() { XML::Document doc(mMonsterReferenceFile); xmlNodePtr rootNode = doc.rootNode(); |