summaryrefslogtreecommitdiff
path: root/src/gui/windows
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/gui/windows
parenta55ff67c4595d4a18fc36ffed90cbde3797498a3 (diff)
downloadmv-8c0d021d271e713208a40968a7e758a24a034fe8.tar.gz
mv-8c0d021d271e713208a40968a7e758a24a034fe8.tar.bz2
mv-8c0d021d271e713208a40968a7e758a24a034fe8.tar.xz
mv-8c0d021d271e713208a40968a7e758a24a034fe8.zip
add ability to include config parts from subdirs for other dbs.
Diffstat (limited to 'src/gui/windows')
-rw-r--r--src/gui/windows/questswindow.cpp3
-rw-r--r--src/gui/windows/skilldialog.cpp3
2 files changed, 6 insertions, 0 deletions
diff --git a/src/gui/windows/questswindow.cpp b/src/gui/windows/questswindow.cpp
index e039b8ba4..fff6f352a 100644
--- a/src/gui/windows/questswindow.cpp
+++ b/src/gui/windows/questswindow.cpp
@@ -41,6 +41,8 @@
#include "utils/translation/podict.h"
+#include "resources/beingcommon.h"
+
#include "debug.h"
enum QuestType
@@ -183,6 +185,7 @@ QuestsWindow::QuestsWindow() :
enableVisibleSound(true);
loadXmlFile(paths.getStringValue("questsFile"));
loadXmlFile(paths.getStringValue("questsPatchFile"));
+ loadXmlDir("questsPatchDir", loadXmlFile);
}
QuestsWindow::~QuestsWindow()
diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp
index 989d5a96d..844bca4ec 100644
--- a/src/gui/windows/skilldialog.cpp
+++ b/src/gui/windows/skilldialog.cpp
@@ -51,6 +51,8 @@
#include "utils/dtor.h"
#include "utils/gettext.h"
+#include "resources/beingcommon.h"
+
#include <guichan/font.hpp>
#include "debug.h"
@@ -433,6 +435,7 @@ void SkillDialog::loadSkills()
if (mSkills.empty())
loadXmlFile(paths.getStringValue("skillsFile2"));
loadXmlFile(paths.getStringValue("skillsPatchFile"));
+ loadXmlDir("skillsPatchDir", loadXmlFile);
update();
}