Massive (partial) conversion to new combat system

NOTE: DOES NOT COMPILE

Serves as a checkpoint for the massive conversion of the old combat
system to the new one (with regard to splitting combat into phases and
unifying many of the methods of melee_attack together that does not
have regard for the attacker or defenders' atype(). When the compile
issues are corrected, there will undoubtedly have been a number of
changes - some documented in commits past and others not - which affect
the mechanics, timings, or output of combat and will need to be
evaluated on a case by case basis for balance and inclusion in the
final product of this rewrite.

1 files changed, 1 insertions, 12 deletions

diff --git a/crawl-ref/source/attack.h b/crawl-ref/source/attack.h
index 7d97f683c2..ba8e3a33b3 100644
--- a/crawl-ref/source/attack.h
+++ b/crawl-ref/source/attack.h
@@ -9,17 +9,6 @@ const int HIT_WEAK   = 7;
 const int HIT_MED    = 18;
 const int HIT_STRONG = 36;
 
-enum atk_phase
-{
-    ATK_ATTEMPTED,                      //  0
-    ATK_DODGED,
-    ATK_BLOCKED,
-    ATK_HIT,
-    ATK_DAMAGED,
-    ATK_KILLED,
-    ATK_END
-};
-
 class attack
 {
 // Public Properties
@@ -27,8 +16,8 @@ public:
     // General attack properties, set on instantiation or through a normal
     // thread of execution
     actor        *attacker, *defender;
-    atk_phase    attack_phase;
 
+    bool    attack_occurred;
     bool    cancel_attack;
     bool    did_hit;
     bool    needs_message;