Apply r9879 to trunk, minus harpies.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9880 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 15 insertions, 1 deletions

diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc
index 4b366828dc..ddff3fdc7c 100644
--- a/crawl-ref/source/output.cc
+++ b/crawl-ref/source/output.cc
@@ -750,7 +750,7 @@ static void _get_status_lights(std::vector<status_light>& out)
     if (you.attribute[ATTR_HELD])
         out.push_back(status_light(RED, "Held"));
 
-    if (you.backlit(false))
+    if (you.magic_contamination || you.backlit(false))
     {
         int color = you.magic_contamination > 5
             ? _bad_ench_colour( you.magic_contamination, 15, 25 )
@@ -2457,6 +2457,20 @@ std::string _status_mut_abilities()
         status.push_back(help);
     }
 
+    if (you.magic_contamination > 0)
+    {
+        const int cont = get_contamination_level();
+        snprintf(info, INFO_SIZE, "%sglowing",
+                 (cont == 0) ? "very slightly " :
+                 (cont == 1) ? "slightly " :
+                 (cont == 2) ? "" :
+                 (cont == 3) ? "moderately " :
+                 (cont == 4) ? "heavily "
+                             : "really heavily ");
+
+        status.push_back(info);
+    }
+
     if (you.rotting || you.species == SP_GHOUL)
         status.push_back("rotting");