summaryrefslogtreecommitdiff
path: root/src/gui/windows/questswindow.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/gui/windows/questswindow.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/gui/windows/questswindow.cpp')
-rw-r--r--src/gui/windows/questswindow.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/gui/windows/questswindow.cpp b/src/gui/windows/questswindow.cpp
index eed82636b..c75fde58f 100644
--- a/src/gui/windows/questswindow.cpp
+++ b/src/gui/windows/questswindow.cpp
@@ -125,8 +125,8 @@ QuestsWindow::QuestsWindow() :
loadWindowState();
enableVisibleSound(true);
- loadXmlFile(paths.getStringValue("questsFile"));
- loadXmlFile(paths.getStringValue("questsPatchFile"));
+ loadXmlFile(paths.getStringValue("questsFile"), SkipError_false);
+ loadXmlFile(paths.getStringValue("questsPatchFile"), SkipError_true);
loadXmlDir("questsPatchDir", loadXmlFile);
}
@@ -162,9 +162,12 @@ QuestsWindow::~QuestsWindow()
}
}
-void QuestsWindow::loadXmlFile(const std::string &fileName)
+void QuestsWindow::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 root = doc.rootNode();
if (!root)
return;
@@ -175,7 +178,7 @@ void QuestsWindow::loadXmlFile(const std::string &fileName)
{
const std::string name = XML::getProperty(varNode, "name", "");
if (!name.empty())
- loadXmlFile(name);
+ loadXmlFile(name, skipError);
continue;
}
else if (xmlNameEqual(varNode, "var"))