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/resources/iteminfo.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/resources/iteminfo.cpp')
| -rw-r--r-- | src/resources/iteminfo.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp index 5fb1ff82..4b1d82ea 100644 --- a/src/resources/iteminfo.cpp +++ b/src/resources/iteminfo.cpp @@ -22,6 +22,7 @@ #include "resources/iteminfo.h" #include "resources/itemdb.h" +#include "configuration.h" const std::string &ItemInfo::getSprite(Gender gender) const { @@ -68,7 +69,7 @@ void ItemInfo::setWeaponType(int type) void ItemInfo::addSound(EquipmentSoundEvent event, const std::string &filename) { - mSounds[event].push_back("sfx/" + filename); + mSounds[event].push_back(paths.getValue("sfx", "sfx/") + filename); } const std::string &ItemInfo::getSound(EquipmentSoundEvent event) const |