summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/output.cc
diff options
context:
space:
mode:
authorNeil Moore <neil@s-z.org>2014-07-30 07:05:56 -0400
committerNeil Moore <neil@s-z.org>2014-07-30 07:05:56 -0400
commite4dd375ad42e3eb7f8df2265d786fd320db06970 (patch)
tree67194f7bc97fdd720fcbe64da7224be7113d659a /crawl-ref/source/output.cc
parent4ccbf14a0f29572fe3fb64aaada6e1450c0e90ec (diff)
downloadcrawl-ref-e4dd375ad42e3eb7f8df2265d786fd320db06970.tar.gz
crawl-ref-e4dd375ad42e3eb7f8df2265d786fd320db06970.zip
Make corrosion override all weapon colours (#8836)
Including your hands. This fixes the non-webtiles-specific parts of #8836.
Diffstat (limited to 'crawl-ref/source/output.cc')
-rw-r--r--crawl-ref/source/output.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc
index b32c272228..86b2f86594 100644
--- a/crawl-ref/source/output.cc
+++ b/crawl-ref/source/output.cc
@@ -849,6 +849,9 @@ static void _print_stats_ev(int x, int y)
*/
static int _wpn_name_colour()
{
+ if (you.duration[DUR_CORROSION])
+ return RED;
+
if (you.weapon())
{
const item_def& wpn = *you.weapon();
@@ -857,8 +860,6 @@ static int _wpn_name_colour()
const int prefcol = menu_colour(wpn.name(DESC_INVENTORY), prefix, "stats");
if (prefcol != -1)
return prefcol;
- if (you.duration[DUR_CORROSION])
- return RED;
return LIGHTGREY;
}