summaryrefslogtreecommitdiff
path: root/src/resources/db/emotedb.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-01-06 20:43:46 +0300
committerAndrei Karas <akaras@inbox.ru>2014-01-06 20:43:46 +0300
commit463d5c603ea95f478dff4b12fbca3c7dd05cc8b9 (patch)
tree00412a9d4a91de61ee62b3c8b9c03c928db5d809 /src/resources/db/emotedb.cpp
parent286e2b7edc988f93e347b6ccfd51da2a56d18d73 (diff)
downloadManaVerse-463d5c603ea95f478dff4b12fbca3c7dd05cc8b9.tar.gz
ManaVerse-463d5c603ea95f478dff4b12fbca3c7dd05cc8b9.tar.bz2
ManaVerse-463d5c603ea95f478dff4b12fbca3c7dd05cc8b9.tar.xz
ManaVerse-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.cpp3
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;