diff options
author | Adam Borowski <kilobyte@angband.pl> | 2009-12-27 17:48:37 +0100 |
---|---|---|
committer | Adam Borowski <kilobyte@angband.pl> | 2009-12-27 17:48:37 +0100 |
commit | 42d227a273a1334b60ca7574a8127d1a4b2744a1 (patch) | |
tree | 2655bcdeab4c1e157906b88ccefdda7645ee580a /crawl-ref/source/showsymb.cc | |
parent | 5b7701dc9d19fdad4de1a64b41995d65c03b7df6 (diff) | |
parent | dc3e12a4da48363a7cadb77f30b8e784d5f82acf (diff) | |
download | crawl-ref-42d227a273a1334b60ca7574a8127d1a4b2744a1.tar.gz crawl-ref-42d227a273a1334b60ca7574a8127d1a4b2744a1.zip |
Merge branch 'master' into iood
Diffstat (limited to 'crawl-ref/source/showsymb.cc')
-rw-r--r-- | crawl-ref/source/showsymb.cc | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/crawl-ref/source/showsymb.cc b/crawl-ref/source/showsymb.cc index 1d3c4e7dae..6f3c77fea6 100644 --- a/crawl-ref/source/showsymb.cc +++ b/crawl-ref/source/showsymb.cc @@ -56,6 +56,19 @@ glyph get_show_glyph(show_type object) static int _get_mons_colour(const monsters *mons) { int col = mons->colour; + if (!crawl_state.arena && you.misled()) + { + const monsterentry* mdat = get_monster_data(mons->get_mislead_type()); + col = mdat->colour; + // Some monsters (specifically, ugly things and butterflies) are generated + // black. Ugly things are an object of mislead, but never a subject; however + // if a monster summons ugly things (such as Kirke) while under the Misled + // status effect, they will show up black instead of their assigned colour. + // Likewise with any other black-coloured monsters on-screen but not yet + // mislead. {due} + if (col == BLACK) + col = mons->colour; + } if (mons->berserk()) col = RED; @@ -125,7 +138,11 @@ glyph get_item_glyph(const item_def *item) glyph get_mons_glyph(const monsters *mons) { glyph g; - g.ch = mons_char(mons->type); + + if (!crawl_state.arena && you.misled()) + g.ch = mons_char(mons->get_mislead_type()); + else + g.ch = mons_char(mons->type); g.col = _get_mons_colour(mons); return (g); } |