From 5961e9e4fc1842801d800fbbe37dc41bf8c7f037 Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Sat, 21 Nov 2009 18:40:50 -0600 Subject: Make (very) ugly thing corpse tiles handle the different colors. I can't test this in-game, but main.png displays all the different colored corpses properly, so I think it works. --- crawl-ref/source/rltiles/dc-corpse.txt | 10 ++++++++++ crawl-ref/source/tilepick.cc | 12 ++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) (limited to 'crawl-ref') diff --git a/crawl-ref/source/rltiles/dc-corpse.txt b/crawl-ref/source/rltiles/dc-corpse.txt index 231fa4f68c..4d021669ee 100644 --- a/crawl-ref/source/rltiles/dc-corpse.txt +++ b/crawl-ref/source/rltiles/dc-corpse.txt @@ -156,7 +156,17 @@ minotaur CORPSE_MINOTAUR ## Ugly things ('u') %sdir dc-mon/demons ugly_thing CORPSE_UGLY_THING +ugly_thing1 +ugly_thing2 +ugly_thing3 +ugly_thing4 +ugly_thing5 very_ugly_thing CORPSE_VERY_UGLY_THING +very_ugly_thing1 +very_ugly_thing2 +very_ugly_thing3 +very_ugly_thing4 +very_ugly_thing5 ## Giants ('C') %sdir dc-mon diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index b5d5ffd5e3..d8f8e85cb7 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -1737,9 +1737,17 @@ static int _tileidx_corpse(const item_def &item) // ugly things ('u') case MONS_UGLY_THING: - return TILE_CORPSE_UGLY_THING; case MONS_VERY_UGLY_THING: - return TILE_CORPSE_VERY_UGLY_THING; + { + const int ugly_corpse_tile = (type == MONS_VERY_UGLY_THING) ? + TILE_CORPSE_VERY_UGLY_THING : TILE_CORPSE_UGLY_THING; + int colour_offset = ugly_thing_colour_offset(item.colour); + + if (colour_offset == -1) + colour_offset = 0; + + return (ugly_corpse_tile + colour_offset); + } // worms ('w') case MONS_KILLER_BEE_LARVA: -- cgit v1.2.3-54-g00ecf