From d5a00a320043f5782ebc489285c89943b667e094 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 12 May 2016 00:18:57 +0300 Subject: Add skipError parameter to loadXml functions. This allow not show errors for some not main xml files. --- src/resources/db/npcdialogdb.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/resources/db/npcdialogdb.cpp') 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; } } -- cgit v1.2.3-70-g09d2