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/player.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/player.cpp')
-rw-r--r-- | src/player.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/player.cpp b/src/player.cpp index 1f706cb8..e6102b6a 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -118,8 +118,10 @@ void Player::logic() default: break; } Particle *p; - p = particleEngine->addEffect("graphics/particles/" + - particleEffect, 0, 0, rotation); + p = particleEngine->addEffect( + paths.getValue("particles", + "graphics/particles/") + + particleEffect, 0, 0, rotation); controlParticle(p); } @@ -193,8 +195,8 @@ void Player::setSprite(int slot, int id, const std::string &color, if (!color.empty()) filename += "|" + color; - equipmentSprite = AnimatedSprite::load("graphics/sprites/" + - filename); + equipmentSprite = AnimatedSprite::load( + paths.getValue("sprites", "graphics/sprites/") + filename); } if (equipmentSprite) |