diff options
author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-10-08 08:37:11 -0500 |
---|---|---|
committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-10-08 08:37:11 -0500 |
commit | 22982415537d288bc2429b225dceafc64a79db95 (patch) | |
tree | 441a6d616c03500e36c00f4322fca6d31cf6d983 /crawl-ref/source/tilepick.cc | |
parent | 41775ce5f4aff9ab0e28256ad885377756e89e14 (diff) | |
download | crawl-ref-22982415537d288bc2429b225dceafc64a79db95.tar.gz crawl-ref-22982415537d288bc2429b225dceafc64a79db95.zip |
With help from jpeg, fix tile picking for (very) ugly things found via
Detect Monsters.
Diffstat (limited to 'crawl-ref/source/tilepick.cc')
-rw-r--r-- | crawl-ref/source/tilepick.cc | 14 |
1 files changed, 6 insertions, 8 deletions
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') |