diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-05-12 00:18:57 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-05-12 00:51:22 +0300 |
| commit | d5a00a320043f5782ebc489285c89943b667e094 (patch) | |
| tree | eb64f3b1f81f7ba2a3c7ff9e02ad329ef21abb83 /src/resources/db/avatardb.cpp | |
| parent | 742b2a22bdcb69e6f615a284065ba2696e7bc261 (diff) | |
| download | manaplus-d5a00a320043f5782ebc489285c89943b667e094.tar.gz manaplus-d5a00a320043f5782ebc489285c89943b667e094.tar.bz2 manaplus-d5a00a320043f5782ebc489285c89943b667e094.tar.xz manaplus-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/avatardb.cpp')
| -rw-r--r-- | src/resources/db/avatardb.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/resources/db/avatardb.cpp b/src/resources/db/avatardb.cpp index b62d13bbf..e41664e9a 100644 --- a/src/resources/db/avatardb.cpp +++ b/src/resources/db/avatardb.cpp @@ -46,14 +46,17 @@ void AvatarDB::load() { if (mLoaded) unload(); - loadXmlFile(paths.getStringValue("avatarsFile")); - loadXmlFile(paths.getStringValue("avatarsPatchFile")); + loadXmlFile(paths.getStringValue("avatarsFile"), SkipError_false); + loadXmlFile(paths.getStringValue("avatarsPatchFile"), SkipError_true); loadXmlDir("avatarsPatchDir", loadXmlFile); } -void AvatarDB::loadXmlFile(const std::string &fileName) +void AvatarDB::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 rootNode = doc.rootNode(); if (!rootNode || !xmlNameEqual(rootNode, "avatars")) @@ -70,7 +73,7 @@ void AvatarDB::loadXmlFile(const std::string &fileName) { const std::string name = XML::getProperty(avatarNode, "name", ""); if (!name.empty()) - loadXmlFile(name); + loadXmlFile(name, skipError); continue; } |