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/units.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/units.cpp')
| -rw-r--r-- | src/units.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/units.cpp b/src/units.cpp index 57cc3aa6e..237b414f0 100644 --- a/src/units.cpp +++ b/src/units.cpp @@ -100,14 +100,15 @@ void Units::loadUnits() units[UNIT_CURRENCY] = ud; } - loadXmlFile(paths.getStringValue("unitsFile")); - loadXmlFile(paths.getStringValue("unitsPatchFile")); + loadXmlFile(paths.getStringValue("unitsFile"), SkipError_false); + loadXmlFile(paths.getStringValue("unitsPatchFile"), SkipError_true); loadXmlDir("unitsPatchDir", loadXmlFile); } -void Units::loadXmlFile(const std::string &fileName) +void Units::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 root = doc.rootNode(); if (!root || !xmlNameEqual(root, "units")) @@ -123,7 +124,7 @@ void Units::loadXmlFile(const std::string &fileName) { const std::string name = XML::getProperty(node, "name", ""); if (!name.empty()) - loadXmlFile(name); + loadXmlFile(name, skipError); continue; } else if (xmlNameEqual(node, "unit")) |