diff options
| author | elliptic <hyperelliptical@gmail.com> | 2013-03-07 23:22:16 -0500 |
|---|---|---|
| committer | elliptic <hyperelliptical@gmail.com> | 2013-03-07 23:26:09 -0500 |
| commit | 8f33a4fbf221408d7c63b19f7ab072eca7e48b63 (patch) | |
| tree | 2e799139761b2b1fb17d82d505fc387fc9c6aee9 /crawl-ref/source/melee_attack.h | |
| parent | 40d21e897e6e45167f301ec15fdee10be2cd0f20 (diff) | |
| download | crawl-ref-8f33a4fbf221408d7c63b19f7ab072eca7e48b63.tar.gz crawl-ref-8f33a4fbf221408d7c63b19f7ab072eca7e48b63.zip | |
Don't skip handle_phase_end() when bailing out of the melee code early.
This caused a lot of bad behavior when combined with cleaving, since the
second half of the cleaving was called from handle_phase_end(). In
particular, the Axe of Woe now gets a full cleave again.
The auxiliary attack was moved out of handle_phase_end() to
handle_phase_aux(). The other things in handle_phase_end() are hopefully
reasonable to do at the end of any attack.
Diffstat (limited to 'crawl-ref/source/melee_attack.h')
| -rw-r--r-- | crawl-ref/source/melee_attack.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crawl-ref/source/melee_attack.h b/crawl-ref/source/melee_attack.h index 8d74c3c709..99cbffb155 100644 --- a/crawl-ref/source/melee_attack.h +++ b/crawl-ref/source/melee_attack.h @@ -76,6 +76,7 @@ private: bool handle_phase_hit(); bool handle_phase_damaged(); bool handle_phase_killed(); + bool handle_phase_aux(); bool handle_phase_end(); /* Combat Calculations */ |