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/mercenarydb.h | |
| 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/mercenarydb.h')
| -rw-r--r-- | src/resources/db/mercenarydb.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/resources/db/mercenarydb.h b/src/resources/db/mercenarydb.h index 66b27548a..3bfa5c80b 100644 --- a/src/resources/db/mercenarydb.h +++ b/src/resources/db/mercenarydb.h @@ -24,6 +24,7 @@ #define RESOURCES_DB_MERCENARYDB_H #include "enums/simpletypes/beingtypeid.h" +#include "enums/simpletypes/skiperror.h" #include "localconsts.h" @@ -40,7 +41,8 @@ namespace MercenaryDB void unload(); - void loadXmlFile(const std::string &fileName); + void loadXmlFile(const std::string &fileName, + const SkipError skipError); BeingInfo *get(const BeingTypeId id) A_WARN_UNUSED; } // namespace MercenaryDB |