diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-05-12 00:18:57 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-05-12 00:51:22 +0300 |
commit | d5a00a320043f5782ebc489285c89943b667e094 (patch) | |
tree | eb64f3b1f81f7ba2a3c7ff9e02ad329ef21abb83 /src/resources/db/monsterdb.cpp | |
parent | 742b2a22bdcb69e6f615a284065ba2696e7bc261 (diff) | |
download | manaverse-d5a00a320043f5782ebc489285c89943b667e094.tar.gz manaverse-d5a00a320043f5782ebc489285c89943b667e094.tar.bz2 manaverse-d5a00a320043f5782ebc489285c89943b667e094.tar.xz manaverse-d5a00a320043f5782ebc489285c89943b667e094.zip |
Add skipError parameter to loadXml functions.
This allow not show errors for some not main xml files.
Diffstat (limited to 'src/resources/db/monsterdb.cpp')
-rw-r--r-- | src/resources/db/monsterdb.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/resources/db/monsterdb.cpp b/src/resources/db/monsterdb.cpp index 133b2545d..777fa32a7 100644 --- a/src/resources/db/monsterdb.cpp +++ b/src/resources/db/monsterdb.cpp @@ -48,16 +48,17 @@ void MonsterDB::load() unload(); logger->log1("Initializing monster database..."); - loadXmlFile(paths.getStringValue("monstersFile")); - loadXmlFile(paths.getStringValue("monstersPatchFile")); + loadXmlFile(paths.getStringValue("monstersFile"), SkipError_false); + loadXmlFile(paths.getStringValue("monstersPatchFile"), SkipError_true); loadXmlDir("monstersPatchDir", loadXmlFile); mLoaded = true; } -void MonsterDB::loadXmlFile(const std::string &fileName) +void MonsterDB::loadXmlFile(const std::string &fileName, + const SkipError skipError) { - XML::Document doc(fileName, UseResman_true, SkipError_false); + XML::Document doc(fileName, UseResman_true, skipError); const XmlNodePtr rootNode = doc.rootNode(); if (!rootNode || !xmlNameEqual(rootNode, "monsters")) @@ -78,7 +79,7 @@ void MonsterDB::loadXmlFile(const std::string &fileName) { const std::string name = XML::getProperty(monsterNode, "name", ""); if (!name.empty()) - loadXmlFile(name); + loadXmlFile(name, skipError); continue; } if (!xmlNameEqual(monsterNode, "monster")) |