Break up you_attack() into a slew of smaller functions. The functions are

still fairly tangled, but they're better than the old monster. The idea is to
also put monster-vs-player and monster-vs-monster into the melee_attack
framework so that refactoring combat code with elements of 4.1 becomes easier.

This is a big refactoring, so it's likely to be buggy. Some of the combat
diagnostics - notably the damage rolls - are also AWOL. Will fix going forward.

Note: The combat code is still classic b26.

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

1 files changed, 8 insertions, 0 deletions

diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 4c19fd10f4..9cb755a6d1 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -169,6 +169,13 @@ enum activity_interrupt_payload_type
     AIP_HP_LOSS
 };
 
+enum actor_type
+{
+    ACT_NONE = -1,
+    ACT_PLAYER,
+    ACT_MONSTER
+};
+
 enum ammunition_description_type
 {
     DAMMO_ORCISH = 3,                  //    3
@@ -1835,6 +1842,7 @@ enum mons_class_flags
     M_UNIQUE            = (1<<20),        // monster is a unique
 
     M_CLAWS             = (1<<21),        // Chops off hydra heads in combat.
+    M_ACID_SPLASH       = (1<<22),        // Passive acid splash when hit.
 
     M_SPECIAL_ABILITY   = (1<<26),        // XXX: eventually make these spells?