diff options
| -rw-r--r-- | src/defaults.cpp | 5 | ||||
| -rw-r--r-- | src/effectmanager.cpp | 3 | ||||
| -rw-r--r-- | src/gui/windows/questswindow.cpp | 3 | ||||
| -rw-r--r-- | src/gui/windows/skilldialog.cpp | 3 | ||||
| -rw-r--r-- | src/statuseffect.cpp | 4 | ||||
| -rw-r--r-- | src/units.cpp | 3 |
6 files changed, 20 insertions, 1 deletions
diff --git a/src/defaults.cpp b/src/defaults.cpp index e420c8805..7755ac32b 100644 --- a/src/defaults.cpp +++ b/src/defaults.cpp @@ -476,15 +476,20 @@ DefaultsData* getPathsDefaults() AddDEF("statusEffectsFile", "status-effects.xml"); AddDEF("statusEffectsPatchFile", "status-effects_patch.xml"); + AddDEF("statusEffectsPatchDir", "status-effects.d"); AddDEF("effectsFile", "effects.xml"); AddDEF("effectsPatchFile", "effects_patch.xml"); + AddDEF("effectsPatchDir", "effects.d"); AddDEF("unitsFile", "units.xml"); AddDEF("unitsPatchFile", "units_patch.xml"); + AddDEF("unitsPatchDir", "units.d"); AddDEF("featuresFile", "features.xml"); AddDEF("questsFile", "quests.xml"); AddDEF("questsPatchFile", "quests_patch.xml"); + AddDEF("questsPatchDir", "quests.d"); AddDEF("skillsFile", "skills.xml"); AddDEF("skillsPatchFile", "skills_patch.xml"); + AddDEF("skillsPatchDir", "skills.d"); AddDEF("skillsFile2", "ea-skills.xml"); AddDEF("equipmentWindowFile", "equipmentwindow.xml"); AddDEF("emotesFile", "emotes.xml"); diff --git a/src/effectmanager.cpp b/src/effectmanager.cpp index ad333d1c4..6b5a4617c 100644 --- a/src/effectmanager.cpp +++ b/src/effectmanager.cpp @@ -30,6 +30,8 @@ #include "particle/particle.h" +#include "resources/beingcommon.h" + #include "debug.h" EffectManager::EffectManager() : @@ -38,6 +40,7 @@ EffectManager::EffectManager() : logger->log1("Effects are now loading"); loadXmlFile(paths.getStringValue("effectsFile")); loadXmlFile(paths.getStringValue("effectsPatchFile")); + loadXmlDir("effectsPatchDir", loadXmlFile); } void EffectManager::loadXmlFile(const std::string &fileName) 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(); } 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; } diff --git a/src/units.cpp b/src/units.cpp index 0c31e1553..7260acf68 100644 --- a/src/units.cpp +++ b/src/units.cpp @@ -28,6 +28,8 @@ #include "utils/stringutils.h" #include "utils/xml.h" +#include "resources/beingcommon.h" + #include <climits> #include <vector> @@ -104,6 +106,7 @@ void Units::loadUnits() loadXmlFile(paths.getStringValue("unitsFile")); loadXmlFile(paths.getStringValue("unitsPatchFile")); + loadXmlDir("unitsPatchDir", loadXmlFile); } void Units::loadXmlFile(const std::string &fileName) |