diff options
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/db/badgesdb.cpp | 12 | ||||
| -rw-r--r-- | src/resources/db/weaponsdb.cpp | 6 |
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() |