summaryrefslogtreecommitdiff
path: root/src/actorsprite.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/actorsprite.cpp
parent582428edf9e40db0d1ed7b78222562a7a5031fe4 (diff)
downloadmv-22f79fd0d623c8e11994905534f53da267e22935.tar.gz
mv-22f79fd0d623c8e11994905534f53da267e22935.tar.bz2
mv-22f79fd0d623c8e11994905534f53da267e22935.tar.xz
mv-22f79fd0d623c8e11994905534f53da267e22935.zip
Dehardcode item colors. Now reading all from configs.
Diffstat (limited to 'src/actorsprite.cpp')
-rw-r--r--src/actorsprite.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/actorsprite.cpp b/src/actorsprite.cpp
index 4188ff224..686c871e7 100644
--- a/src/actorsprite.cpp
+++ b/src/actorsprite.cpp
@@ -312,7 +312,7 @@ void ActorSprite::setupSpriteDisplay(const SpriteDisplay &display,
it != it_end; ++it)
{
std::string file = "graphics/sprites/"
- + combineDye((*it)->sprite, color);
+ + combineDye2((*it)->sprite, color);
int variant = (*it)->variant;
addSprite(AnimatedSprite::load(file, variant));
@@ -339,7 +339,7 @@ void ActorSprite::setupSpriteDisplay(const SpriteDisplay &display,
imagePath = "graphics/items/" + display.floor;
break;
}
- imagePath = combineDye(imagePath, color);
+ imagePath = combineDye2(imagePath, color);
Image *img = resman->getImage(imagePath);