summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/fight.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-19 07:57:15 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-19 07:57:15 +0000
commit990084e0bd9bc3863b0a3a75307367ef6c745624 (patch)
tree2d694b879e70de9a32a730a48fa4276baed864af /crawl-ref/source/fight.cc
parentb353902c5b7312fbd2f7d4959ea5c6971bc6db74 (diff)
downloadcrawl-ref-990084e0bd9bc3863b0a3a75307367ef6c745624.tar.gz
crawl-ref-990084e0bd9bc3863b0a3a75307367ef6c745624.zip
Make draining beams properly take full negative energy resistance into
account. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8583 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/fight.cc')
-rw-r--r--crawl-ref/source/fight.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 53ee28d25d..662a51f259 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -2925,7 +2925,7 @@ bool melee_attack::apply_damage_brand()
break;
}
case SPWPN_PAIN:
- if (defender->res_negative_energy() > 0)
+ if (defender->res_negative_energy())
break;
if (x_chance_in_y(attacker->skill(SK_NECROMANCY) + 1, 8))
@@ -3233,7 +3233,7 @@ void melee_attack::player_apply_staff_damage()
}
case STAFF_DEATH:
- if (defender->res_negative_energy() > 0)
+ if (defender->res_negative_energy())
break;
if (x_chance_in_y(you.skills[SK_NECROMANCY] + 1, 8))