diff options
Diffstat (limited to 'crawl-ref/source/itemprop.cc')
| -rw-r--r-- | crawl-ref/source/itemprop.cc | 24 |
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 ) |