summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/ouch.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-19 18:36:11 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-19 18:36:11 +0000
commit436078067b93a484213ed2a2bc212e7127f75e49 (patch)
tree227d78cd1533d250df0a04eeca28be669b33747e /crawl-ref/source/ouch.cc
parent76d8c3651ddb1bf23d77db2e04e3c70cdec8f636 (diff)
downloadcrawl-ref-436078067b93a484213ed2a2bc212e7127f75e49.tar.gz
crawl-ref-436078067b93a484213ed2a2bc212e7127f75e49.zip
Rename cleansing flame resistance to holy energy resistance, and clean
up holy wrath weapon checks. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8595 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/ouch.cc')
-rw-r--r--crawl-ref/source/ouch.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/ouch.cc b/crawl-ref/source/ouch.cc
index ca82412f81..ca1954ef41 100644
--- a/crawl-ref/source/ouch.cc
+++ b/crawl-ref/source/ouch.cc
@@ -220,12 +220,12 @@ int check_your_resists(int hurted, beam_type flavour)
case BEAM_HOLY:
{
// Cleansing flame.
- const int rcf = you.res_cleansing_flame(NULL);
- if (rcf > 0)
+ const int rhe = you.res_holy_energy(NULL);
+ if (rhe > 0)
hurted = 0;
- else if (rcf == 0)
+ else if (rhe == 0)
hurted /= 2;
- else if (rcf < -1)
+ else if (rhe < -1)
hurted = (hurted * 3) / 2;
if (hurted == 0)