summaryrefslogtreecommitdiff
path: root/src/resources/db/statuseffectdb.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-05-12 00:18:57 +0300
committerAndrei Karas <akaras@inbox.ru>2016-05-12 00:51:22 +0300
commitd5a00a320043f5782ebc489285c89943b667e094 (patch)
treeeb64f3b1f81f7ba2a3c7ff9e02ad329ef21abb83 /src/resources/db/statuseffectdb.cpp
parent742b2a22bdcb69e6f615a284065ba2696e7bc261 (diff)
downloadmv-d5a00a320043f5782ebc489285c89943b667e094.tar.gz
mv-d5a00a320043f5782ebc489285c89943b667e094.tar.bz2
mv-d5a00a320043f5782ebc489285c89943b667e094.tar.xz
mv-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/statuseffectdb.cpp')
-rw-r--r--src/resources/db/statuseffectdb.cpp12
1 files changed, 7 insertions, 5 deletions
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"))