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/skillunitdb.cpp | |
parent | 742b2a22bdcb69e6f615a284065ba2696e7bc261 (diff) | |
download | manaplus-d5a00a320043f5782ebc489285c89943b667e094.tar.gz manaplus-d5a00a320043f5782ebc489285c89943b667e094.tar.bz2 manaplus-d5a00a320043f5782ebc489285c89943b667e094.tar.xz manaplus-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/skillunitdb.cpp')
-rw-r--r-- | src/resources/db/skillunitdb.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/resources/db/skillunitdb.cpp b/src/resources/db/skillunitdb.cpp index f77e3f3a2..16a080abd 100644 --- a/src/resources/db/skillunitdb.cpp +++ b/src/resources/db/skillunitdb.cpp @@ -47,15 +47,16 @@ void SkillUnitDb::load() unload(); logger->log1("Initializing skill unit database..."); - loadXmlFile(paths.getStringValue("skillUnitsFile")); - loadXmlFile(paths.getStringValue("skillUnitsPatchFile")); + loadXmlFile(paths.getStringValue("skillUnitsFile"), SkipError_true); + loadXmlFile(paths.getStringValue("skillUnitsPatchFile"), SkipError_false); loadXmlDir("skillUnitsPatchDir", loadXmlFile); mLoaded = true; } -void SkillUnitDb::loadXmlFile(const std::string &fileName) +void SkillUnitDb::loadXmlFile(const std::string &fileName, + const SkipError skipError) { - XML::Document doc(fileName, UseResman_true, SkipError_false); + XML::Document doc(fileName, UseResman_true, skipError); const XmlNodePtrConst rootNode = doc.rootNode(); if (!rootNode || !xmlNameEqual(rootNode, "skillunits")) @@ -73,7 +74,7 @@ void SkillUnitDb::loadXmlFile(const std::string &fileName) const std::string name = XML::getProperty(skillUnitNode, "name", ""); if (!name.empty()) - loadXmlFile(name); + loadXmlFile(name, skipError); continue; } else if (!xmlNameEqual(skillUnitNode, "skillunit")) |