summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/output.cc
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/output.cc')
-rw-r--r--crawl-ref/source/output.cc16
1 files changed, 10 insertions, 6 deletions
diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc
index c9b98acc04..94a331dfcf 100644
--- a/crawl-ref/source/output.cc
+++ b/crawl-ref/source/output.cc
@@ -737,13 +737,17 @@ static void _get_status_lights(std::vector<status_light>& out)
out.push_back(status_light(RED, "Held"));
}
- // Don't display "Glow" for a visible player inside a halo.
- if (you.backlit(you.duration[DUR_INVIS]))
+ if (you.backlit())
{
- int color = you.magic_contamination > 5
- ? _bad_ench_colour( you.magic_contamination, 15, 25 )
- : LIGHTBLUE;
- out.push_back(status_light(color, "Glow"));
+ if (!you.backlit(false) && you.haloed())
+ out.push_back(status_light(LIGHTBLUE, "Halo"));
+ else
+ {
+ int color = you.magic_contamination > 5
+ ? _bad_ench_colour( you.magic_contamination, 15, 25 )
+ : LIGHTBLUE;
+ out.push_back(status_light(color, "Glow"));
+ }
}
if (you.duration[DUR_SWIFTNESS])