summaryrefslogtreecommitdiffstats
path: root/src/game-server/settingsmanager.cpp
diff options
context:
space:
mode:
authorPrzemysław Grzywacz <nexather@gmail.com>2013-05-03 15:16:34 +0200
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2013-05-03 15:28:41 +0200
commitf6f27a9ffaf72f9856240db1bb788a9efa3e86f0 (patch)
tree2be68e1fd640061f0bdd062e906e2521879fef31 /src/game-server/settingsmanager.cpp
parenteb9fdd6852fced4ca9125b93585b95eb319dce18 (diff)
downloadmanaserv-f6f27a9ffaf72f9856240db1bb788a9efa3e86f0.tar.gz
manaserv-f6f27a9ffaf72f9856240db1bb788a9efa3e86f0.tar.xz
manaserv-f6f27a9ffaf72f9856240db1bb788a9efa3e86f0.zip
Maps are now configured in settings.xml too
Diffstat (limited to 'src/game-server/settingsmanager.cpp')
-rw-r--r--src/game-server/settingsmanager.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/game-server/settingsmanager.cpp b/src/game-server/settingsmanager.cpp
index 79aade1..b45ef93 100644
--- a/src/game-server/settingsmanager.cpp
+++ b/src/game-server/settingsmanager.cpp
@@ -25,6 +25,7 @@
#include "common/resourcemanager.h"
+#include "game-server/mapmanager.h"
#include "game-server/attributemanager.h"
#include "game-server/skillmanager.h"
#include "game-server/specialmanager.h"
@@ -41,6 +42,7 @@
void SettingsManager::initialize()
{
// initialize all managers in correct order
+ MapManager::initialize();
attributeManager->initialize();
skillManager->initialize();
specialManager->initialize();
@@ -61,6 +63,7 @@ void SettingsManager::initialize()
*/
void SettingsManager::reload()
{
+ MapManager::reload();
attributeManager->reload();
skillManager->reload();
specialManager->reload();
@@ -125,6 +128,11 @@ void SettingsManager::loadFile(const std::string &filename)
}
}
}
+ else if (xmlStrEqual(childNode->name, BAD_CAST "map"))
+ {
+ // map config
+ MapManager::readMapNode(childNode);
+ }
else if (xmlStrEqual(childNode->name, BAD_CAST "attribute"))
{
// attribute config
@@ -181,6 +189,7 @@ void SettingsManager::loadFile(const std::string &filename)
*/
void SettingsManager::checkStatus()
{
+ MapManager::checkStatus();
attributeManager->checkStatus();
skillManager->checkStatus();
specialManager->checkStatus();