summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/output.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-06-11 17:05:24 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-06-11 17:05:24 +0000
commit9729c61a6771ce007e98a1da6c42a28374408fc7 (patch)
tree43c5f69c54e86bd383a64db7d7b6669154f8262f /crawl-ref/source/output.cc
parenta7ae331fadafe35f3bc95b165c2206268e05e325 (diff)
downloadcrawl-ref-9729c61a6771ce007e98a1da6c42a28374408fc7.tar.gz
crawl-ref-9729c61a6771ce007e98a1da6c42a28374408fc7.zip
* Fix 2804813: Auto-removing the stronger of two rings of the same type.
(You now get to choose, we might want to auto-remove the weaker instead.) * Change "Glow" colouring for magic contamination < 5 to darkgrey. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.5@9964 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/output.cc')
-rw-r--r--crawl-ref/source/output.cc12
1 files changed, 8 insertions, 4 deletions
diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc
index ddff3fdc7c..553b8ca0b7 100644
--- a/crawl-ref/source/output.cc
+++ b/crawl-ref/source/output.cc
@@ -752,10 +752,14 @@ static void _get_status_lights(std::vector<status_light>& out)
if (you.magic_contamination || you.backlit(false))
{
- int color = you.magic_contamination > 5
- ? _bad_ench_colour( you.magic_contamination, 15, 25 )
- : LIGHTBLUE;
- out.push_back(status_light(color, "Glow"));
+ int colour = LIGHTBLUE;
+ if (you.magic_contamination > 0)
+ {
+ colour = (you.magic_contamination > 5
+ ? _bad_ench_colour( you.magic_contamination, 15, 25 )
+ : DARKGREY);
+ }
+ out.push_back(status_light(colour, "Glow"));
}
if (you.duration[DUR_SWIFTNESS])