diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-01-06 20:43:46 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-01-06 20:43:46 +0300 |
| commit | 463d5c603ea95f478dff4b12fbca3c7dd05cc8b9 (patch) | |
| tree | 00412a9d4a91de61ee62b3c8b9c03c928db5d809 /src/resources/db/colordb.cpp | |
| parent | 286e2b7edc988f93e347b6ccfd51da2a56d18d73 (diff) | |
| download | mv-463d5c603ea95f478dff4b12fbca3c7dd05cc8b9.tar.gz mv-463d5c603ea95f478dff4b12fbca3c7dd05cc8b9.tar.bz2 mv-463d5c603ea95f478dff4b12fbca3c7dd05cc8b9.tar.xz mv-463d5c603ea95f478dff4b12fbca3c7dd05cc8b9.zip | |
add ability to inlude config parts from subdirs for most dbs.
Diffstat (limited to 'src/resources/db/colordb.cpp')
| -rw-r--r-- | src/resources/db/colordb.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/resources/db/colordb.cpp b/src/resources/db/colordb.cpp index 276b7e77a..06dff0d3a 100644 --- a/src/resources/db/colordb.cpp +++ b/src/resources/db/colordb.cpp @@ -26,6 +26,8 @@ #include "utils/xml.h" +#include "resources/beingcommon.h" + #include "debug.h" namespace @@ -49,12 +51,19 @@ void ColorDB::load() colors = it->second; loadHair(paths.getStringValue("hairColorFile"), colors); loadHair(paths.getStringValue("hairColorPatchFile"), colors); + StringVect list; + BeingCommon::getIncludeFiles(paths.getStringValue( + "hairColorPatchDir"), list); + FOR_EACH (StringVectCIter, it, list) + loadHair(*it, colors); + mColorLists["hair"] = colors; if (serverVersion >= 1) { loadColorLists(paths.getStringValue("itemColorsFile")); loadColorLists(paths.getStringValue("itemColorsPatchFile")); + loadXmlDir("itemColorsPatchDir", loadColorLists); } it = mColorLists.find("hair"); |