summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/melee_attack.h
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2012-03-21 00:37:59 +0100
committerAdam Borowski <kilobyte@angband.pl>2012-03-22 01:59:35 +0100
commitf22ecef8817a579eaba48747c8327f06424393bc (patch)
treed0a65c4f2182cf95da161accb768dfc36d55c4ab /crawl-ref/source/melee_attack.h
parent4f4a9bad6935debba45f98fddaedeb1cc7283187 (diff)
downloadcrawl-ref-f22ecef8817a579eaba48747c8327f06424393bc.tar.gz
crawl-ref-f22ecef8817a579eaba48747c8327f06424393bc.zip
Fix weapons not corroding upon one-shotting a jelly.
Also, this commit makes attacker_sustain_passive_damage() called for monsters as well. The check for weapon corrosion applying to the player only has been moved there for now, it'd be good to implement that for everyone. Not doing this outright as this would hurt Beoghites and thus it may be better to discuss this first.
Diffstat (limited to 'crawl-ref/source/melee_attack.h')
-rw-r--r--crawl-ref/source/melee_attack.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/melee_attack.h b/crawl-ref/source/melee_attack.h
index 485a8868b7..2553e9689a 100644
--- a/crawl-ref/source/melee_attack.h
+++ b/crawl-ref/source/melee_attack.h
@@ -159,7 +159,7 @@ private:
void player_exercise_combat_skills();
bool player_monattk_hit_effects();
- void player_sustain_passive_damage();
+ void attacker_sustain_passive_damage();
int staff_damage(skill_type skill);
void apply_staff_damage();
void player_stab_check();