From 5feccd8e038752a00f9408159da613ba7fd02be1 Mon Sep 17 00:00:00 2001 From: dolorous Date: Thu, 16 Jul 2009 12:49:37 +0000 Subject: Fix inconsistencies with resistance displays in the "%" screen, including a fix for [2822291]. (For the record, there still seem to be some inconsistencies with how many levels some resistances have; do acid resistance and clarity have 3 levels or 1?) git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10229 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/output.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'crawl-ref/source/output.cc') diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc index 1eb6726ae1..366386004d 100644 --- a/crawl-ref/source/output.cc +++ b/crawl-ref/source/output.cc @@ -2086,7 +2086,6 @@ static std::vector _get_overview_resistances( const int rmuta = (wearing_amulet(AMU_RESIST_MUTATION, calc_unid) || player_mutation_level(MUT_MUTATION_RESISTANCE) == 3 || you.religion == GOD_ZIN && you.piety >= 150); - const int rslow = wearing_amulet(AMU_RESIST_SLOW, calc_unid); snprintf(buf, sizeof buf, @@ -2133,9 +2132,9 @@ static std::vector _get_overview_resistances( const int rward = (wearing_amulet(AMU_WARDING, calc_unid) || you.religion == GOD_VEHUMET && !player_under_penance() && you.piety >= piety_breakpoint(2)); - const int rcons = wearing_amulet(AMU_CONSERVATION, calc_unid); - const int rcorr = wearing_amulet(AMU_RESIST_CORROSION, calc_unid); - const int rclar = wearing_amulet(AMU_CLARITY, calc_unid); + const int rcons = player_item_conserve(calc_unid); + const int rcorr = player_res_acid(calc_unid); + const int rclar = player_mental_clarity(calc_unid); snprintf(buf, sizeof buf, "%sSee Invis. : %s\n" "%sWarding : %s\n" -- cgit v1.2.3-54-g00ecf