Don't skip handle_phase_end() when bailing out of the melee code early.
authorelliptic <hyperelliptical@gmail.com>
Fri, 8 Mar 2013 04:22:16 +0000 (23:22 -0500)
committerelliptic <hyperelliptical@gmail.com>
Fri, 8 Mar 2013 04:26:09 +0000 (23:26 -0500)
commit8f33a4fbf221408d7c63b19f7ab072eca7e48b63
tree2e799139761b2b1fb17d82d505fc387fc9c6aee9
parent40d21e897e6e45167f301ec15fdee10be2cd0f20
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.
crawl-ref/source/melee_attack.cc
crawl-ref/source/melee_attack.h