summaryrefslogtreecommitdiff
path: root/src/resources/db
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-05-12 01:02:51 +0300
committerAndrei Karas <akaras@inbox.ru>2016-05-12 01:02:51 +0300
commit07c62ac076c698cb7d6a4f8ceed616d982421f14 (patch)
treefe5b5b2115f1287608dd6c6a0850d36fd7760c12 /src/resources/db
parentd5a00a320043f5782ebc489285c89943b667e094 (diff)
downloadmanaplus-07c62ac076c698cb7d6a4f8ceed616d982421f14.tar.gz
manaplus-07c62ac076c698cb7d6a4f8ceed616d982421f14.tar.bz2
manaplus-07c62ac076c698cb7d6a4f8ceed616d982421f14.tar.xz
manaplus-07c62ac076c698cb7d6a4f8ceed616d982421f14.zip
Add skipError parameter into xmlutils.
Diffstat (limited to 'src/resources/db')
-rw-r--r--src/resources/db/badgesdb.cpp12
-rw-r--r--src/resources/db/weaponsdb.cpp6
2 files changed, 11 insertions, 7 deletions
diff --git a/src/resources/db/badgesdb.cpp b/src/resources/db/badgesdb.cpp
index 059a22112..6ee66f180 100644
--- a/src/resources/db/badgesdb.cpp
+++ b/src/resources/db/badgesdb.cpp
@@ -37,7 +37,8 @@ namespace
static void loadXmlFile(const std::string &file,
const std::string &name,
- BadgesInfos &arr)
+ BadgesInfos &arr,
+ const SkipError skipError)
{
readXmlStringMap(file,
"badges",
@@ -45,21 +46,22 @@ static void loadXmlFile(const std::string &file,
"badge",
"name",
"image",
- arr);
+ arr,
+ skipError);
}
static void loadDB(const std::string &name, BadgesInfos &arr)
{
loadXmlFile(paths.getStringValue("badgesFile"),
- name, arr);
+ name, arr, SkipError_false);
loadXmlFile(paths.getStringValue("badgesPatchFile"),
- name, arr);
+ name, arr, SkipError_true);
StringVect listVect;
Files::getFilesInDir(paths.getStringValue(
"badgesPatchDir"), listVect, ".xml");
FOR_EACH (StringVectCIter, itVect, listVect)
- loadXmlFile(*itVect, name, arr);
+ loadXmlFile(*itVect, name, arr, SkipError_true);
}
void BadgesDB::load()
diff --git a/src/resources/db/weaponsdb.cpp b/src/resources/db/weaponsdb.cpp
index 3b7860ffd..475b5970e 100644
--- a/src/resources/db/weaponsdb.cpp
+++ b/src/resources/db/weaponsdb.cpp
@@ -34,14 +34,16 @@ namespace
bool mLoaded = false;
}
-static void loadDB(const std::string &name, WeaponsInfos &arr)
+static void loadDB(const std::string &name,
+ WeaponsInfos &arr)
{
readXmlIntVector(paths.getStringValue("weaponsFile"),
"weapons",
name,
"item",
"id",
- arr);
+ arr,
+ SkipError_false);
}
void WeaponsDB::load()