summaryrefslogtreecommitdiff
path: root/src/statuseffect.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-01-06 23:49:57 +0300
committerAndrei Karas <akaras@inbox.ru>2014-01-06 23:51:44 +0300
commit8c0d021d271e713208a40968a7e758a24a034fe8 (patch)
tree17bd1076e10c95ae89801b2faa4215180e9f398b /src/statuseffect.cpp
parenta55ff67c4595d4a18fc36ffed90cbde3797498a3 (diff)
downloadmanaplus-8c0d021d271e713208a40968a7e758a24a034fe8.tar.gz
manaplus-8c0d021d271e713208a40968a7e758a24a034fe8.tar.bz2
manaplus-8c0d021d271e713208a40968a7e758a24a034fe8.tar.xz
manaplus-8c0d021d271e713208a40968a7e758a24a034fe8.zip
add ability to include config parts from subdirs for other dbs.
Diffstat (limited to 'src/statuseffect.cpp')
-rw-r--r--src/statuseffect.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/statuseffect.cpp b/src/statuseffect.cpp
index 7a0020579..4c5262250 100644
--- a/src/statuseffect.cpp
+++ b/src/statuseffect.cpp
@@ -22,12 +22,13 @@
#include "statuseffect.h"
+#include "configuration.h"
#include "logger.h"
#include "soundmanager.h"
#include "gui/widgets/tabs/chattab.h"
-#include "configuration.h"
+#include "resources/beingcommon.h"
#include <map>
@@ -129,6 +130,7 @@ void StatusEffect::load()
loadXmlFile(paths.getStringValue("statusEffectsFile"));
loadXmlFile(paths.getStringValue("statusEffectsPatchFile"));
+ loadXmlDir("statusEffectsPatchDir", loadXmlFile);
mLoaded = true;
}