Refix [2484631], in a way that won't require changes to draining or

rotting attacks: Put the draining attack code back where it was, and 
instead explicitly check for a death-by-banishment when determining 
whether to skip chaos_killed_defender().  Sorry for any confusion.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8342 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 1 insertions, 0 deletions

diff --git a/crawl-ref/source/fight.h b/crawl-ref/source/fight.h
index b96c6785cb..b463ab75fa 100644
--- a/crawl-ref/source/fight.h
+++ b/crawl-ref/source/fight.h
@@ -170,6 +170,7 @@ public:
 
 private:
     void init_attack();
+    bool is_banished(const actor *) const;
     bool is_water_attack(const actor *, const actor *) const;
     void check_hand_half_bonus_eligible();
     void check_autoberserk();