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/colordb.h | |
| parent | 742b2a22bdcb69e6f615a284065ba2696e7bc261 (diff) | |
| download | manaverse-d5a00a320043f5782ebc489285c89943b667e094.tar.gz manaverse-d5a00a320043f5782ebc489285c89943b667e094.tar.bz2 manaverse-d5a00a320043f5782ebc489285c89943b667e094.tar.xz manaverse-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/colordb.h')
| -rw-r--r-- | src/resources/db/colordb.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/resources/db/colordb.h b/src/resources/db/colordb.h index 5c311a08d..dcb417019 100644 --- a/src/resources/db/colordb.h +++ b/src/resources/db/colordb.h @@ -23,6 +23,7 @@ #define RESOURCES_DB_COLORDB_H #include "enums/simpletypes/itemcolor.h" +#include "enums/simpletypes/skiperror.h" #include <map> #include <string> @@ -66,9 +67,11 @@ namespace ColorDB * Loads the color data from <code>colors.xml</code>. */ void loadHair(const std::string &fileName, - std::map<ItemColor, ItemColorData> &colors); + std::map<ItemColor, ItemColorData> &colors, + const SkipError skipError); - void loadColorLists(const std::string &fileName); + void loadColorLists(const std::string &fileName, + const SkipError skipError); /** * Clear the color data |