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/emotedb.cpp | |
| parent | 286e2b7edc988f93e347b6ccfd51da2a56d18d73 (diff) | |
| download | manaplus-463d5c603ea95f478dff4b12fbca3c7dd05cc8b9.tar.gz manaplus-463d5c603ea95f478dff4b12fbca3c7dd05cc8b9.tar.bz2 manaplus-463d5c603ea95f478dff4b12fbca3c7dd05cc8b9.tar.xz manaplus-463d5c603ea95f478dff4b12fbca3c7dd05cc8b9.zip | |
add ability to inlude config parts from subdirs for most dbs.
Diffstat (limited to 'src/resources/db/emotedb.cpp')
| -rw-r--r-- | src/resources/db/emotedb.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/resources/db/emotedb.cpp b/src/resources/db/emotedb.cpp index eee6ec388..907bb75c4 100644 --- a/src/resources/db/emotedb.cpp +++ b/src/resources/db/emotedb.cpp @@ -27,6 +27,8 @@ #include "configuration.h" +#include "resources/beingcommon.h" + #include "debug.h" namespace @@ -54,6 +56,7 @@ void EmoteDB::load() mLastEmote = 0; loadXmlFile(paths.getStringValue("emotesFile")); loadXmlFile(paths.getStringValue("emotesPatchFile")); + loadXmlDir("emotesPatchDir", loadXmlFile); loadSpecialXmlFile("graphics/sprites/manaplus_emotes.xml"); mLoaded = true; |