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, 40 insertions, 0 deletions

diff --git a/crawl-ref/source/ouch.h b/crawl-ref/source/ouch.h
index 6d0662696d..42dd31c35e 100644
--- a/crawl-ref/source/ouch.h
+++ b/crawl-ref/source/ouch.h
@@ -21,6 +21,46 @@
 
 #include "enum.h"
 
+enum kill_method_type
+{
+    KILLED_BY_MONSTER,                 //    0
+    KILLED_BY_POISON,
+    KILLED_BY_CLOUD,
+    KILLED_BY_BEAM,                    //    3
+    KILLED_BY_DEATHS_DOOR,  // should be deprecated, but you never know {dlb}
+    KILLED_BY_LAVA,                    //    5
+    KILLED_BY_WATER,
+    KILLED_BY_STUPIDITY,
+    KILLED_BY_WEAKNESS,
+    KILLED_BY_CLUMSINESS,
+    KILLED_BY_TRAP,                    //   10
+    KILLED_BY_LEAVING,
+    KILLED_BY_WINNING,
+    KILLED_BY_QUITTING,
+    KILLED_BY_DRAINING,
+    KILLED_BY_STARVATION,              //   15
+    KILLED_BY_FREEZING,
+    KILLED_BY_BURNING,
+    KILLED_BY_WILD_MAGIC,
+    KILLED_BY_XOM,
+    KILLED_BY_STATUE,                  //   20
+    KILLED_BY_ROTTING,
+    KILLED_BY_TARGETTING,
+    KILLED_BY_SPORE,
+    KILLED_BY_TSO_SMITING,
+    KILLED_BY_PETRIFICATION,           // 25
+    KILLED_BY_SOMETHING = 27,
+    KILLED_BY_FALLING_DOWN_STAIRS,
+    KILLED_BY_ACID,
+    KILLED_BY_CURARE,                  
+    KILLED_BY_MELTING,
+    KILLED_BY_BLEEDING,
+    KILLED_BY_BEOGH_SMITING,
+
+    NUM_KILLBY
+};
+
+
 // last updated 12may2000 {dlb}
 /* ***********************************************************************
  * called from: bang - beam - effects - spells