diff options
| -rw-r--r-- | crawl-ref/source/item_use.cc | 2 | ||||
| -rw-r--r-- | 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<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]) |