From 22f79fd0d623c8e11994905534f53da267e22935 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 3 Mar 2011 01:25:21 +0200 Subject: Dehardcode item colors. Now reading all from configs. --- src/item.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/item.cpp') 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"); -- cgit v1.2.3-70-g09d2