From 9729c61a6771ce007e98a1da6c42a28374408fc7 Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Thu, 11 Jun 2009 17:05:24 +0000 Subject: * 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 --- crawl-ref/source/item_use.cc | 2 ++ crawl-ref/source/output.cc | 12 ++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 7b169a0062..9478afdb21 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -3493,6 +3493,8 @@ static bool _swap_rings(int ring_slot) // Don't prompt if both rings are of the same type. if (lring->sub_type == rring->sub_type + && lring->plus == rring->plus + && lring->plus2 == rring->plus2 && !is_artefact(*lring) && !is_artefact(*rring)) { if (item_cursed(*lring)) 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& 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]) -- cgit v1.2.3-54-g00ecf