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, 2 insertions, 22 deletions

diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc
index 0cfaa6adce..3b78905ef3 100644
--- a/crawl-ref/source/itemprop.cc
+++ b/crawl-ref/source/itemprop.cc
@@ -24,6 +24,8 @@
 
 #include "externs.h"
 
+#include "decks.h"
+#include "food.h"
 #include "items.h"
 #include "itemprop.h"
 #include "macro.h"
@@ -2340,28 +2342,6 @@ bool is_shield_incompatible(const item_def &weapon, const item_def *shield)
             && !is_range_weapon(weapon);
 }
 
-bool is_deck(const item_def &item)
-{
-    return item.base_type == OBJ_MISCELLANY
-        && (item.sub_type >= MISC_DECK_OF_ESCAPE &&
-            item.sub_type <= MISC_DECK_OF_DEFENSE);
-}
-
-deck_rarity_type deck_rarity(const item_def &item)
-{
-    ASSERT( is_deck(item) );
-    switch (item.colour)
-    {
-    case BLACK: case BLUE: case GREEN: case CYAN: case RED:
-    default:
-        return DECK_RARITY_COMMON;
-    case MAGENTA: case BROWN:
-        return DECK_RARITY_RARE;
-    case LIGHTMAGENTA:
-        return DECK_RARITY_LEGENDARY;
-    }
-}
-
 std::string item_base_name(const item_def &item)
 {
     switch ( item.base_type )