summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/player.cc
diff options
context:
space:
mode:
authorVsevolod Kozlov <zaba@thorium.homeunix.org>2009-11-07 11:30:34 +0300
committerJude Brown <bookofjude@users.sourceforge.net>2009-11-07 18:42:47 +1000
commitf2a54d7ab10bd5bef162023c0659d6922b5bfa04 (patch)
tree11fc33fdffff244a16f88c9c6a4d9bf958e07ada /crawl-ref/source/player.cc
parent0041be617c3f43fb7b74f1634078984a1b70ba1f (diff)
downloadcrawl-ref-f2a54d7ab10bd5bef162023c0659d6922b5bfa04.tar.gz
crawl-ref-f2a54d7ab10bd5bef162023c0659d6922b5bfa04.zip
Replace player_shield with player::shield.
Signed-off-by: Jude Brown <bookofjude@users.sourceforge.net>
Diffstat (limited to 'crawl-ref/source/player.cc')
-rw-r--r--crawl-ref/source/player.cc7
1 files changed, 1 insertions, 6 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index 7734fd26d7..cf5193c2b0 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -2506,12 +2506,6 @@ int player_mag_abil(bool is_weighted)
return ((is_weighted) ? ((ma * you.intel) / 10) : ma);
}
-// Returns the shield the player is wearing, or NULL if none.
-item_def *player_shield()
-{
- return (you.shield());
-}
-
int player_shield_class(void) //jmf: changes for new spell
{
int base_shield = 0;
@@ -5976,6 +5970,7 @@ bool player::could_wield(const item_def &item, bool ignore_brand,
return (true);
}
+// Returns the shield the player is wearing, or NULL if none.
item_def *player::shield()
{
if (!you_tran_can_wear(EQ_SHIELD))