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/statuseffectdb.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/resources/db/statuseffectdb.cpp') diff --git a/src/resources/db/statuseffectdb.cpp b/src/resources/db/statuseffectdb.cpp index 0649497dc..a89915103 100644 --- a/src/resources/db/statuseffectdb.cpp +++ b/src/resources/db/statuseffectdb.cpp @@ -76,16 +76,18 @@ void StatusEffectDB::load() if (mLoaded) unload(); - loadXmlFile(paths.getStringValue("statusEffectsFile")); - loadXmlFile(paths.getStringValue("statusEffectsPatchFile")); + loadXmlFile(paths.getStringValue("statusEffectsFile"), SkipError_false); + loadXmlFile(paths.getStringValue("statusEffectsPatchFile"), + SkipError_true); loadXmlDir("statusEffectsPatchDir", loadXmlFile); mLoaded = true; } -void StatusEffectDB::loadXmlFile(const std::string &fileName) +void StatusEffectDB::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, "status-effects")) @@ -100,7 +102,7 @@ void StatusEffectDB::loadXmlFile(const std::string &fileName) { const std::string incName = XML::getProperty(node, "name", ""); if (!incName.empty()) - loadXmlFile(incName); + loadXmlFile(incName, skipError); continue; } else if (!xmlNameEqual(node, "status-effect")) -- cgit v1.2.3-70-g09d2