summaryrefslogtreecommitdiff
path: root/SpriteObjects.cpp
diff options
context:
space:
mode:
authorPetr Mrázek2012-03-26 16:16:12 +0200
committerPetr Mrázek2012-03-26 16:16:12 +0200
commitf854810fb76a6c83a9ccd3a50f526963b5c85b90 (patch)
tree53d4dc9001d65434a0de2f8a4b649772f9c3b63c /SpriteObjects.cpp
parenta0f6808254168063449b4f7e93afbd879bd1fafd (diff)
parentdf37cc7e59b3cf5fadfa680a68793b91810a30ff (diff)
downloadstonesense-f854810fb76a6c83a9ccd3a50f526963b5c85b90.tar.gz
stonesense-f854810fb76a6c83a9ccd3a50f526963b5c85b90.tar.bz2
stonesense-f854810fb76a6c83a9ccd3a50f526963b5c85b90.tar.xz
Merge https://github.com/JapaMala/stonesense
Diffstat (limited to 'SpriteObjects.cpp')
-rw-r--r--SpriteObjects.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/SpriteObjects.cpp b/SpriteObjects.cpp
index 963fb63..16273ba 100644
--- a/SpriteObjects.cpp
+++ b/SpriteObjects.cpp
@@ -1014,7 +1014,7 @@ ALLEGRO_COLOR c_sprite::get_color(void* block)
else return al_map_rgb(255,255,255);
case ShadeBlood:
return b->bloodcolor;
- case ShadeItem:
+ case ShadeEquip:
if(itemsubtype >=0)
{
//FIXME: need a way to get a material for generic types.
@@ -1030,6 +1030,8 @@ ALLEGRO_COLOR c_sprite::get_color(void* block)
return lookupMaterialColor(b->inv->item[itemtype][itemsubtype][0].matt.type, b->inv->item[itemtype][itemsubtype][0].matt.index);
}
else return al_map_rgb(255,255,255);
+ case ShadeItem:
+ return lookupMaterialColor(b->Item.matt.type, b->Item.matt.index);
default:
return al_map_rgb(255, 255, 255);
} ;