From d5a00a320043f5782ebc489285c89943b667e094 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 12 May 2016 00:18:57 +0300 Subject: Add skipError parameter to loadXml functions. This allow not show errors for some not main xml files. --- src/resources/db/monsterdb.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/resources/db/monsterdb.cpp') 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")) -- cgit v1.2.3-70-g09d2