summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/fight.cc
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-03-08 20:52:08 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-03-08 20:52:08 +0000
commitbb28231c541ca917387a4eb3f1318d8782c06fdb (patch)
treedac423f8bb97693e8e05fef5c420f0cfa66fc395 /crawl-ref/source/fight.cc
parentb31338b60aefb79b5d31e7bd1e3573c5965047e3 (diff)
downloadcrawl-ref-bb28231c541ca917387a4eb3f1318d8782c06fdb.tar.gz
crawl-ref-bb28231c541ca917387a4eb3f1318d8782c06fdb.zip
Fixed jellies not getting acid damage (Erik).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@995 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/fight.cc')
-rw-r--r--crawl-ref/source/fight.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 835bdee2d8..8d02e0d622 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -508,6 +508,8 @@ bool melee_attack::player_attack()
if (player_check_monster_died())
return (true);
+ player_sustain_passive_damage();
+
if (damage_done < 1)
no_damage_message =
make_stringf("You %s %s.",
@@ -2609,7 +2611,10 @@ void melee_attack::splash_monster_with_acid(int strength)
void melee_attack::splash_defender_with_acid(int strength)
{
if (defender->atype() == ACT_PLAYER)
+ {
+ mpr("You are splashed with acid!");
splash_with_acid(strength);
+ }
else
splash_monster_with_acid(strength);
}