Replace uses of get_player_wielded_{item,weapon} with player::weapon.

3 files changed, 8 insertions, 20 deletions

diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index c09358b1f2..596174d6d4 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -748,17 +748,6 @@ bool player_weapon_wielded()
     return (true);
 }
 
-// Returns the you.inv[] index of our wielded weapon or -1 (no item, not wield)
-int get_player_wielded_item()
-{
-    return (you.equip[EQ_WEAPON]);
-}
-
-int get_player_wielded_weapon()
-{
-    return (player_weapon_wielded()? get_player_wielded_item() : -1);
-}
-
 // Returns false if the player is wielding a weapon inappropriate for Berserk.
 bool berserk_check_wielded_weapon()
 {
diff --git a/crawl-ref/source/player.h b/crawl-ref/source/player.h
index 5b9a321a4a..ce99e8a38c 100644
--- a/crawl-ref/source/player.h
+++ b/crawl-ref/source/player.h
@@ -543,7 +543,6 @@ bool player_in_mappable_area(void);
 bool player_in_branch(int branch);
 bool player_in_hell(void);
 
-int get_player_wielded_weapon(void);
 bool berserk_check_wielded_weapon(void);
 int player_equip( equipment_type slot, int sub_type, bool calc_unid = true );
 int player_equip_ego_type( int slot, int sub_type );
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index 879120caa3..9dde1e6f9a 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -4389,11 +4389,11 @@ static bool _altar_prayer()
         && !player_under_penance()
         && you.piety > 160)
     {
-        const int wpn = get_player_wielded_weapon();
+        item_def *wpn = you.weapon();
 
-        if (wpn != -1
-            && (get_weapon_brand(you.inv[wpn]) != SPWPN_HOLY_WRATH
-                || is_blessed_blade_convertible(you.inv[wpn])))
+        if (wpn
+            && (get_weapon_brand(*wpn) != SPWPN_HOLY_WRATH
+            || is_blessed_blade_convertible(*wpn)))
         {
             did_bless = _bless_weapon(GOD_SHINING_ONE, SPWPN_HOLY_WRATH,
                                       YELLOW);
@@ -4406,9 +4406,9 @@ static bool _altar_prayer()
         && !player_under_penance()
         && you.piety > 160)
     {
-        const int wpn = get_player_wielded_weapon();
+        item_def *wpn = you.weapon();
 
-        if (wpn != -1 && get_weapon_brand(you.inv[wpn]) != SPWPN_DISTORTION)
+        if (wpn && get_weapon_brand(*wpn) != SPWPN_DISTORTION)
             did_bless = _bless_weapon(GOD_LUGONU, SPWPN_DISTORTION, MAGENTA);
     }
 
@@ -4423,10 +4423,10 @@ static bool _altar_prayer()
 
         bool kiku_did_bless_weapon = false;
 
-        const int wpn = get_player_wielded_weapon();
+        item_def *wpn = you.weapon();
 
         // Does the player want a pain branding?
-        if (wpn != -1 && get_weapon_brand(you.inv[wpn]) != SPWPN_PAIN)
+        if (wpn && get_weapon_brand(*wpn) != SPWPN_PAIN)
         {
             kiku_did_bless_weapon =
                 _bless_weapon(GOD_KIKUBAAQUDGHA, SPWPN_PAIN, RED);