diff options
| author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2010-07-11 20:05:44 +0200 |
|---|---|---|
| committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2010-07-11 20:05:44 +0200 |
| commit | abde0f51b3062c158fb52e9dfff23d21d3be03d1 (patch) | |
| tree | 4af561ea9e8cd3f7f981cce9817cf57f3e353787 /src/statuseffect.cpp | |
| parent | 93e1a2a9e5f379945a6efb24598319b605be1dfa (diff) | |
| download | mana-abde0f51b3062c158fb52e9dfff23d21d3be03d1.tar.gz mana-abde0f51b3062c158fb52e9dfff23d21d3be03d1.tar.bz2 mana-abde0f51b3062c158fb52e9dfff23d21d3be03d1.tar.xz mana-abde0f51b3062c158fb52e9dfff23d21d3be03d1.zip | |
Made the different hard-coded paths and files be now taken from the
data/paths.xml configuration file.
Also added default gui theme path in branding and default wallpaper path
and file searched respectively in the branding and paths.xml files.
Hard-coded values are still used as fallbacks.
Resolves: Manasource Mantis #148.
Reviewed-by: jaxad0127.
Diffstat (limited to 'src/statuseffect.cpp')
| -rw-r--r-- | src/statuseffect.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/statuseffect.cpp b/src/statuseffect.cpp index 6ab0b8fa..1f913f4a 100644 --- a/src/statuseffect.cpp +++ b/src/statuseffect.cpp @@ -28,6 +28,8 @@ #include "utils/xml.h" +#include "configuration.h" + #include <map> #define STATUS_EFFECTS_FILE "status-effects.xml" @@ -68,7 +70,7 @@ AnimatedSprite *StatusEffect::getIcon() else { AnimatedSprite *sprite = AnimatedSprite::load( - "graphics/sprites/" + mIcon); + paths.getValue("sprites", "graphics/sprites/") + mIcon); if (false && sprite) { sprite->play(ACTION_DEFAULT); @@ -123,8 +125,7 @@ void StatusEffect::load() if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "status-effects")) { - logger->log("Error loading status effects file: " - STATUS_EFFECTS_FILE); + logger->log("Error loading status effects file: " STATUS_EFFECTS_FILE); return; } |