summaryrefslogtreecommitdiff
path: root/src/resources/db/npcdialogdb.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/npcdialogdb.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/npcdialogdb.cpp')
-rw-r--r--src/resources/db/npcdialogdb.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/resources/db/npcdialogdb.cpp b/src/resources/db/npcdialogdb.cpp
index 526561935..d59f472ad 100644
--- a/src/resources/db/npcdialogdb.cpp
+++ b/src/resources/db/npcdialogdb.cpp
@@ -42,8 +42,8 @@ void NpcDialogDB::load()
unload();
logger->log1("Loading npcdialog database...");
- loadXmlFile(paths.getStringValue("npcDialogsFile"));
- loadXmlFile(paths.getStringValue("npcDialogsPatchFile"));
+ loadXmlFile(paths.getStringValue("npcDialogsFile"), SkipError_false);
+ loadXmlFile(paths.getStringValue("npcDialogsPatchFile"), SkipError_true);
loadXmlDir("npcDialogsPatchDir", loadXmlFile);
mLoaded = true;
@@ -144,11 +144,12 @@ static void loadNpcDialog(NpcDialogInfo *const dialog,
}
}
-void NpcDialogDB::loadXmlFile(const std::string &fileName)
+void NpcDialogDB::loadXmlFile(const std::string &fileName,
+ const SkipError skipError)
{
XML::Document *const doc = new XML::Document(fileName,
UseResman_true,
- SkipError_false);
+ skipError);
const XmlNodePtrConst root = doc->rootNode();
if (!root)
@@ -177,7 +178,7 @@ void NpcDialogDB::loadXmlFile(const std::string &fileName)
{
const std::string name = XML::getProperty(node, "name", "");
if (!name.empty())
- loadXmlFile(name);
+ loadXmlFile(name, skipError);
continue;
}
}