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/npc.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/npc.cpp')
| -rw-r--r-- | src/npc.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/npc.cpp b/src/npc.cpp index cdfe5193..a3c26618 100644 --- a/src/npc.cpp +++ b/src/npc.cpp @@ -36,6 +36,7 @@ #include "net/npchandler.h" #include "resources/npcdb.h" +#include "configuration.h" NPC::NPC(int id, int subtype, Map *map): Player(id, subtype, map, true) @@ -68,7 +69,8 @@ void NPC::setSubtype(Uint16 subtype) i != info.sprites.end(); i++) { - std::string file = "graphics/sprites/" + (*i)->sprite; + std::string file = paths.getValue("sprites", + "graphics/sprites/") + (*i)->sprite; int variant = (*i)->variant; mSprites.push_back(AnimatedSprite::load(file, variant)); mSpriteIDs.push_back(0); |