summaryrefslogtreecommitdiff
path: root/src/item.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-03-03 01:25:21 +0200
committerAndrei Karas <akaras@inbox.ru>2011-03-03 01:25:21 +0200
commit22f79fd0d623c8e11994905534f53da267e22935 (patch)
tree04403929ca80f47253f8dd523a29489c0fd30162 /src/item.cpp
parent582428edf9e40db0d1ed7b78222562a7a5031fe4 (diff)
downloadmanaverse-22f79fd0d623c8e11994905534f53da267e22935.tar.gz
manaverse-22f79fd0d623c8e11994905534f53da267e22935.tar.bz2
manaverse-22f79fd0d623c8e11994905534f53da267e22935.tar.xz
manaverse-22f79fd0d623c8e11994905534f53da267e22935.zip
Dehardcode item colors. Now reading all from configs.
Diffstat (limited to 'src/item.cpp')
-rw-r--r--src/item.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/item.cpp b/src/item.cpp
index 02f775834..ed0685a9d 100644
--- a/src/item.cpp
+++ b/src/item.cpp
@@ -75,7 +75,7 @@ void Item::setId(int id, unsigned char color)
SpriteDisplay display = info.getDisplay();
std::string imagePath = paths.getStringValue("itemIcons")
+ display.image;
- std::string dye = combineDye(imagePath, info.getDyeString(color));
+ std::string dye = combineDye2(imagePath, info.getDyeColorsString(color));
mImage = resman->getImage(dye);
mDrawImage = resman->getImage(dye);
@@ -106,7 +106,7 @@ Image *Item::getImage(int id, unsigned char color)
SpriteDisplay display = info.getDisplay();
std::string imagePath = "graphics/items/" + display.image;
Image *image;
- image = resman->getImage(combineDye(imagePath, info.getDyeString(color)));
+ image = resman->getImage(combineDye2(imagePath, info.getDyeColorsString(color)));
if (!image)
image = Theme::getImageFromTheme("unknown-item.png");