summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/fight.cc
diff options
context:
space:
mode:
authorharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-16 23:45:54 +0000
committerharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-16 23:45:54 +0000
commite14b5260df1fa0e9400a1d0c3472f5d8dcc97e89 (patch)
tree9ff1b099ac1a20cdbd4c300e843fb5d5d47950b8 /crawl-ref/source/fight.cc
parent5bc26d2ec84ef6c3163012109a9ef388862a6852 (diff)
downloadcrawl-ref-e14b5260df1fa0e9400a1d0c3472f5d8dcc97e89.tar.gz
crawl-ref-e14b5260df1fa0e9400a1d0c3472f5d8dcc97e89.zip
Fix 2019860: beef jerky wasn't considered meat.
Fix 2019581: weapon flavour was flowing through to subsequent attacks. Fix 2001572: persistent --more-- after dying to explosions. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6577 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)
{