From 22982415537d288bc2429b225dceafc64a79db95 Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Thu, 8 Oct 2009 08:37:11 -0500 Subject: With help from jpeg, fix tile picking for (very) ugly things found via Detect Monsters. --- crawl-ref/source/tilepick.cc | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'crawl-ref/source/tilepick.cc') diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index 591a6459fe..26563f3de1 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -352,18 +352,16 @@ int tileidx_monster_base(const monsters *mon, bool detected) // ugly things ('u') case MONS_UGLY_THING: - { - const int colour_offset = ugly_thing_colour_offset(mon); - if (colour_offset == -1) - colour_offset = 0; - return TILEP_MONS_UGLY_THING + colour_offset; - } case MONS_VERY_UGLY_THING: { + const int ugly_tile = (type == MONS_VERY_UGLY_THING) ? + TILEP_MONS_VERY_UGLY_THING : TILEP_MONS_UGLY_THING; const int colour_offset = ugly_thing_colour_offset(mon); - if (colour_offset == -1) + + if (colour_offset == -1 || detected) colour_offset = 0; - return TILEP_MONS_VERY_UGLY_THING + colour_offset; + + return (ugly_tile + colour_offset); } // vortices ('v') -- cgit v1.2.3-54-g00ecf