diff options
| -rw-r--r-- | crawl-ref/source/player.cc | 9 | ||||
| -rw-r--r-- | crawl-ref/source/player.h | 2 |
2 files changed, 2 insertions, 9 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index 5dd852ff30..7734fd26d7 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -732,13 +732,6 @@ bool you_tran_can_wear(int eq, bool check_mutation) return (true); } -// Returns the item in the given equipment slot, NULL if the slot is empty. -// eq must be in [EQ_WEAPON, EQ_AMULET], or bad things will happen. -item_def *player_slot_item(equipment_type eq) -{ - return (you.slot_item(eq)); -} - // Returns the item in the player's weapon slot. item_def *player_weapon() { @@ -5922,6 +5915,8 @@ int player::damage_brand(int) return (ret); } +// Returns the item in the given equipment slot, NULL if the slot is empty. +// eq must be in [EQ_WEAPON, EQ_AMULET], or bad things will happen. item_def *player::slot_item(equipment_type eq) { ASSERT(eq >= EQ_WEAPON && eq <= EQ_AMULET); diff --git a/crawl-ref/source/player.h b/crawl-ref/source/player.h index 0ea3752a17..dd77859abf 100644 --- a/crawl-ref/source/player.h +++ b/crawl-ref/source/player.h @@ -741,8 +741,6 @@ void dec_haste_player(); bool disease_player(int amount); void dec_disease_player(); -item_def *player_slot_item(equipment_type eq); - bool player_weapon_wielded(); item_def *player_weapon(); item_def *player_shield(); |