Split off portions of externs.h and enum.h into other files. The

crawl_environment, player and monsters classes have been left in
externs.h, which necessitates that all of the enums references by
those classes stay in enums.h, since you can't forward declare an
enum.  However, it's a start.

Also, portions of misc.{cc,h} have been split off into traps.{cc,h},
place.{cc,h} and terrain.{cc,h}


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

1 files changed, 22 insertions, 0 deletions

diff --git a/crawl-ref/source/monstuff.h b/crawl-ref/source/monstuff.h
index 9612fed7af..c1167ee0d2 100644
--- a/crawl-ref/source/monstuff.h
+++ b/crawl-ref/source/monstuff.h
@@ -16,6 +16,28 @@
 
 #include "mon-util.h"
 
+enum mon_dam_level_type
+{
+    MDAM_OKAY,
+    MDAM_LIGHTLY_DAMAGED,
+    MDAM_MODERATELY_DAMAGED,
+    MDAM_HEAVILY_DAMAGED,
+    MDAM_HORRIBLY_DAMAGED,
+    MDAM_ALMOST_DEAD,
+    MDAM_DEAD
+};
+
+enum mon_desc_type   // things that cross categorical lines {dlb}
+{
+    MDSC_LEAVES_HIDE,                  //    0
+    MDSC_REGENERATES,
+    MDSC_NOMSG_WOUNDS
+};
+
+#define YOU_KILL(x) ((x) == KILL_YOU || (x) == KILL_YOU_MISSILE \
+                     || (x) == KILL_YOU_CONF)
+#define MON_KILL(x) ((x) == KILL_MON || (x) == KILL_MON_MISSILE)
+
 // useful macro
 #define SAME_ATTITUDE(x) (mons_friendly(x)? BEH_FRIENDLY:    \
                           mons_neutral(x)?  BEH_NEUTRAL : BEH_HOSTILE)