summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/fight.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-17 08:11:52 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-17 08:11:52 +0000
commit0ffe1315339223ae3b68b79ff2a68fbb3665a865 (patch)
tree8c8be438e0787879fdb07c622b09399236e5c822 /crawl-ref/source/fight.cc
parent0a69a524938f8c559947685b901abdb22043925b (diff)
downloadcrawl-ref-0ffe1315339223ae3b68b79ff2a68fbb3665a865.tar.gz
crawl-ref-0ffe1315339223ae3b68b79ff2a68fbb3665a865.zip
Apply Haran's fixes (r6577) to 0.4.1.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6582 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/fight.cc')
-rw-r--r--crawl-ref/source/fight.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index f5821ebb84..5f6b47c671 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -3858,6 +3858,8 @@ void melee_attack::mons_perform_attack_rounds()
if (attack_number > 0 && attacker == defender)
break;
+ init_attack();
+
const mon_attack_def attk = mons_attack_spec(atk, attack_number);
if (attk.type == AT_NONE)
{