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

diff --git a/crawl-ref/source/itemname.h b/crawl-ref/source/itemname.h
index e3dbdd23d4..33ce92f5fd 100644
--- a/crawl-ref/source/itemname.h
+++ b/crawl-ref/source/itemname.h
@@ -16,6 +16,66 @@
 
 #include "externs.h"
 
+enum item_type_id_type
+{
+    IDTYPE_WANDS = 0,
+    IDTYPE_SCROLLS,
+    IDTYPE_JEWELLERY,
+    IDTYPE_POTIONS,
+    NUM_IDTYPE
+};
+
+enum item_type_id_state_type  // used for values in id[4][50]
+{
+    ID_UNKNOWN_TYPE = 0,
+    ID_MON_TRIED_TYPE,
+    ID_TRIED_TYPE,
+    ID_KNOWN_TYPE
+};
+
+// [dshaligram] If you edit potion colours/descriptions, also update 
+// itemname.cc.
+enum potion_description_colour_type
+{
+    PDC_CLEAR,
+    PDC_BLUE,
+    PDC_BLACK,
+    PDC_SILVERY,
+    PDC_CYAN,
+    PDC_PURPLE,
+    PDC_ORANGE,
+    PDC_INKY,
+    PDC_RED,
+    PDC_YELLOW,
+    PDC_GREEN,
+    PDC_BROWN,
+    PDC_PINK,
+    PDC_WHITE,
+    PDC_NCOLOURS
+};
+
+// [dshaligram] If you edit potion colours/descriptions, also update 
+// itemname.cc.
+enum potion_description_qualifier_type
+{
+    PDQ_NONE,
+    PDQ_BUBBLING,
+    PDQ_FUMING,
+    PDQ_FIZZY,
+    PDQ_VISCOUS,
+    PDQ_LUMPY,
+    PDQ_SMOKY,
+    PDQ_GLOWING,
+    PDQ_SEDIMENTED,
+    PDQ_METALLIC,
+    PDQ_MURKY,
+    PDQ_GLUGGY,
+    PDQ_OILY,
+    PDQ_SLIMY,
+    PDQ_EMULSIFIED,
+    PDQ_NQUALS
+};
+
 bool is_vowel( const char chr );
 
 /* ***********************************************************************
@@ -45,6 +105,8 @@ std::string make_name( unsigned long seed, bool all_caps );
  * *********************************************************************** */
 void init_properties();
 
+typedef FixedArray < item_type_id_state_type, NUM_IDTYPE, 50 > id_arr;
+
 id_arr& get_typeid_array();
 item_type_id_state_type get_ident_type(object_class_type basetype,
                                        int subtype);