summaryrefslogtreecommitdiff
path: root/SpriteObjects.cpp
diff options
context:
space:
mode:
authorJapa Illo2012-03-26 22:03:09 +0200
committerJapa Illo2012-03-26 22:03:09 +0200
commit4d146bbbba642b08465d8ee275612f29bfbbe7ed (patch)
treeb7721d2d64d338ee5b57be967ade98f0b9740c8c /SpriteObjects.cpp
parentdf37cc7e59b3cf5fadfa680a68793b91810a30ff (diff)
downloadstonesense-4d146bbbba642b08465d8ee275612f29bfbbe7ed.tar.gz
stonesense-4d146bbbba642b08465d8ee275612f29bfbbe7ed.tar.bz2
stonesense-4d146bbbba642b08465d8ee275612f29bfbbe7ed.tar.xz
Put in sprites for all the items, also made errors go to the console.
Signed-off-by: Japa Illo <japa.mala.illo@gmail.com>
Diffstat (limited to 'SpriteObjects.cpp')
-rw-r--r--SpriteObjects.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/SpriteObjects.cpp b/SpriteObjects.cpp
index 1896e4a..ff5af5e 100644
--- a/SpriteObjects.cpp
+++ b/SpriteObjects.cpp
@@ -1026,11 +1026,11 @@ ALLEGRO_COLOR c_sprite::get_color(void* block)
return al_map_rgb(255, 255, 0);
if(b->inv->item[itemtype][itemsubtype].empty())
return al_map_rgb(0, 0, 255);
- return lookupMaterialColor(b->inv->item[itemtype][itemsubtype][0].matt.type, b->inv->item[itemtype][itemsubtype][0].matt.index);
+ return lookupMaterialColor(b->inv->item[itemtype][itemsubtype][0].matt.type, b->inv->item[itemtype][itemsubtype][0].matt.index, b->inv->item[itemtype][itemsubtype][0].dyed);
}
else return al_map_rgb(255,255,255);
case ShadeItem:
- return lookupMaterialColor(b->Item.matt.type, b->Item.matt.index);
+ return lookupMaterialColor(b->Item.matt.type, b->Item.matt.index, b->Item.dyed);
default:
return al_map_rgb(255, 255, 255);
} ;