summaryrefslogtreecommitdiff
path: root/src/gui/windows/skilldialog.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/skilldialog.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/gui/windows/skilldialog.cpp')
-rw-r--r--src/gui/windows/skilldialog.cpp15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp
index a11e0b5aa..b61afb70f 100644
--- a/src/gui/windows/skilldialog.cpp
+++ b/src/gui/windows/skilldialog.cpp
@@ -266,18 +266,21 @@ void SkillDialog::hideSkills(const SkillOwner::Type owner)
void SkillDialog::loadSkills()
{
clearSkills();
- loadXmlFile(paths.getStringValue("skillsFile"));
+ loadXmlFile(paths.getStringValue("skillsFile"), SkipError_false);
if (mSkills.empty())
- loadXmlFile(paths.getStringValue("skillsFile2"));
- loadXmlFile(paths.getStringValue("skillsPatchFile"));
+ loadXmlFile(paths.getStringValue("skillsFile2"), SkipError_false);
+ loadXmlFile(paths.getStringValue("skillsPatchFile"), SkipError_true);
loadXmlDir("skillsPatchDir", loadXmlFile);
update();
}
-void SkillDialog::loadXmlFile(const std::string &fileName)
+void SkillDialog::loadXmlFile(const std::string &fileName,
+ const SkipError skipError)
{
- XML::Document doc(fileName, UseResman_true, SkipError_false);
+ XML::Document doc(fileName,
+ UseResman_true,
+ skipError);
XmlNodePtrConst root = doc.rootNode();
int setCount = 0;
@@ -294,7 +297,7 @@ void SkillDialog::loadXmlFile(const std::string &fileName)
{
const std::string name = XML::getProperty(set, "name", "");
if (!name.empty())
- loadXmlFile(name);
+ loadXmlFile(name, skipError);
continue;
}
else if (xmlNameEqual(set, "set"))