diff options
| author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2010-07-19 20:22:59 +0200 |
|---|---|---|
| committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2010-07-19 20:22:59 +0200 |
| commit | 86eb0c08d233636cd4647649c6542d3cf410e3ab (patch) | |
| tree | 9721759b41f0256f15c3786c357448a93215440e /src/item.cpp | |
| parent | 335eec717f6189c01d8217dd2c4f4e74a171d9a5 (diff) | |
| parent | 2d584d7e8aaeacbcb1036bae5c8deca9b810fe60 (diff) | |
| download | mana-86eb0c08d233636cd4647649c6542d3cf410e3ab.tar.gz mana-86eb0c08d233636cd4647649c6542d3cf410e3ab.tar.bz2 mana-86eb0c08d233636cd4647649c6542d3cf410e3ab.tar.xz mana-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/item.cpp')
| -rw-r--r-- | src/item.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/item.cpp b/src/item.cpp index 19bb7c23..6e55ad0a 100644 --- a/src/item.cpp +++ b/src/item.cpp @@ -26,6 +26,7 @@ #include "resources/image.h" #include "resources/iteminfo.h" #include "resources/resourcemanager.h" +#include "configuration.h" Item::Item(int id, int quantity, bool equipment, bool equipped): mImage(0), @@ -58,13 +59,17 @@ void Item::setId(int id) ResourceManager *resman = ResourceManager::getInstance(); SpriteDisplay display = getInfo().getDisplay(); - std::string imagePath = "graphics/items/" + display.image; + std::string imagePath = paths.getValue("itemIcons", "graphics/items/") + + display.image; mImage = resman->getImage(imagePath); mDrawImage = resman->getImage(imagePath); if (!mImage) - mImage = Theme::getImageFromTheme("unknown-item.png"); + mImage = Theme::getImageFromTheme(paths.getValue("unknownItemFile", + "unknown-item.png")); if (!mDrawImage) - mDrawImage = Theme::getImageFromTheme("unknown-item.png"); + mDrawImage = Theme::getImageFromTheme( + paths.getValue("unknownItemFile", + "unknown-item.png")); } |