summaryrefslogtreecommitdiff
path: root/src/resources/db/moddb.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/moddb.cpp
parent742b2a22bdcb69e6f615a284065ba2696e7bc261 (diff)
downloadmanaverse-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/moddb.cpp')
-rw-r--r--src/resources/db/moddb.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/resources/db/moddb.cpp b/src/resources/db/moddb.cpp
index c76bb8352..a03461d32 100644
--- a/src/resources/db/moddb.cpp
+++ b/src/resources/db/moddb.cpp
@@ -42,15 +42,16 @@ void ModDB::load()
{
if (mLoaded)
unload();
- loadXmlFile(paths.getStringValue("modsFile"));
- loadXmlFile(paths.getStringValue("modsPatchFile"));
+ loadXmlFile(paths.getStringValue("modsFile"), SkipError_false);
+ loadXmlFile(paths.getStringValue("modsPatchFile"), SkipError_true);
loadXmlDir("modsPatchDir", loadXmlFile);
mLoaded = true;
}
-void ModDB::loadXmlFile(const std::string &fileName)
+void ModDB::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, "mods"))
@@ -66,7 +67,7 @@ void ModDB::loadXmlFile(const std::string &fileName)
{
const std::string name = XML::getProperty(modNode, "name", "");
if (!name.empty())
- loadXmlFile(name);
+ loadXmlFile(name, skipError);
continue;
}