summaryrefslogtreecommitdiff
path: root/src/resources/db/emotedb.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/emotedb.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/emotedb.cpp')
-rw-r--r--src/resources/db/emotedb.cpp21
1 files changed, 12 insertions, 9 deletions
diff --git a/src/resources/db/emotedb.cpp b/src/resources/db/emotedb.cpp
index b2f9a0581..2d8804630 100644
--- a/src/resources/db/emotedb.cpp
+++ b/src/resources/db/emotedb.cpp
@@ -58,17 +58,19 @@ void EmoteDB::load()
logger->log1("Initializing emote database...");
mLastEmote = 0;
- loadXmlFile(paths.getStringValue("emotesFile"));
- loadXmlFile(paths.getStringValue("emotesPatchFile"));
+ loadXmlFile(paths.getStringValue("emotesFile"), SkipError_false);
+ loadXmlFile(paths.getStringValue("emotesPatchFile"), SkipError_true);
loadXmlDir("emotesPatchDir", loadXmlFile);
- loadSpecialXmlFile("graphics/sprites/manaplus_emotes.xml");
+ loadSpecialXmlFile("graphics/sprites/manaplus_emotes.xml",
+ SkipError_false);
mLoaded = true;
}
-void EmoteDB::loadXmlFile(const std::string &fileName)
+void EmoteDB::loadXmlFile(const std::string &fileName,
+ const SkipError skipError)
{
- XML::Document doc(fileName, UseResman_true, SkipError_false);
+ XML::Document doc(fileName, UseResman_true, skipError);
XmlNodePtrConst rootNode = doc.rootNode();
if (!rootNode || !xmlNameEqual(rootNode, "emotes"))
@@ -85,7 +87,7 @@ void EmoteDB::loadXmlFile(const std::string &fileName)
{
const std::string name = XML::getProperty(emoteNode, "name", "");
if (!name.empty())
- loadXmlFile(name);
+ loadXmlFile(name, skipError);
continue;
}
else if (!xmlNameEqual(emoteNode, "emote"))
@@ -142,9 +144,10 @@ void EmoteDB::loadXmlFile(const std::string &fileName)
}
}
-void EmoteDB::loadSpecialXmlFile(const std::string &fileName)
+void EmoteDB::loadSpecialXmlFile(const std::string &fileName,
+ const SkipError skipError)
{
- XML::Document doc(fileName, UseResman_true, SkipError_false);
+ XML::Document doc(fileName, UseResman_true, skipError);
XmlNodePtrConst rootNode = doc.rootNode();
if (!rootNode || !xmlNameEqual(rootNode, "emotes"))
@@ -161,7 +164,7 @@ void EmoteDB::loadSpecialXmlFile(const std::string &fileName)
{
const std::string name = XML::getProperty(emoteNode, "name", "");
if (!name.empty())
- loadSpecialXmlFile(name);
+ loadSpecialXmlFile(name, skipError);
continue;
}
else if (!xmlNameEqual(emoteNode, "emote"))