Remove some redundant code and unused variable warnings.

Merge melee_attack::handle_{player,monster}_constriction into one
function that handles both cases.

Avoid unread variable warnings when compiling without DEBUG_DIAGNOSTICS.

Also, appropriately attribute constriction kills by confused enemies.

1 files changed, 3 insertions, 2 deletions

diff --git a/crawl-ref/source/melee_attack.h b/crawl-ref/source/melee_attack.h
index 688b048e61..6bd22b1a49 100644
--- a/crawl-ref/source/melee_attack.h
+++ b/crawl-ref/source/melee_attack.h
@@ -71,6 +71,8 @@ private:
     bool handle_phase_damaged();
     bool handle_phase_killed();
     bool handle_phase_end();
+    // Replaces some of the above phases.
+    bool handle_constriction();
 
     /* Combat Calculations */
     int test_hit(int to_hit, int ev);
@@ -168,6 +170,7 @@ private:
     void player_warn_miss();
     void player_weapon_upsets_god();
     void _monster_die(monster* mons, killer_type killer, int killer_index);
+    void _defender_die();
 
     // Output methods
     void stab_message();
@@ -181,8 +184,6 @@ private:
                                      bool needs_bite_msg = false,
                                      int reduction = 1);
     bool _vamp_wants_blood_from_monster(const monster* mon);
-    void handle_player_constriction();
-    bool handle_monster_constriction();
 };
 
 #endif