summaryrefslogtreecommitdiff
path: root/src/statuseffect.cpp
diff options
context:
space:
mode:
authorYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2010-07-19 20:22:59 +0200
committerYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2010-07-19 20:22:59 +0200
commit86eb0c08d233636cd4647649c6542d3cf410e3ab (patch)
tree9721759b41f0256f15c3786c357448a93215440e /src/statuseffect.cpp
parent335eec717f6189c01d8217dd2c4f4e74a171d9a5 (diff)
parent2d584d7e8aaeacbcb1036bae5c8deca9b810fe60 (diff)
downloadmana-client-86eb0c08d233636cd4647649c6542d3cf410e3ab.tar.gz
mana-client-86eb0c08d233636cd4647649c6542d3cf410e3ab.tar.bz2
mana-client-86eb0c08d233636cd4647649c6542d3cf410e3ab.tar.xz
mana-client-86eb0c08d233636cd4647649c6542d3cf410e3ab.zip
Merge branch '1.0'
Conflicts: src/gui/itempopup.cpp src/item.cpp src/monster.cpp src/net/manaserv/playerhandler.cpp src/net/tmwa/partyhandler.cpp src/npc.cpp src/player.cpp src/resources/itemdb.cpp src/resources/monsterdb.cpp src/resources/monsterinfo.cpp src/resources/npcdb.cpp src/resources/spritedef.cpp
Diffstat (limited to 'src/statuseffect.cpp')
-rw-r--r--src/statuseffect.cpp7
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;
}