Refactor duplicate code from can_wield()

1 files changed, 1 insertions, 36 deletions

diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index bbb9e3e95a..75320437bc 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -121,35 +121,8 @@ bool can_wield(item_def *weapon, bool say_reason,
         }
     }
 
-    if (you.species == SP_FELID && is_weapon(*weapon))
-    {
-        SAY(mpr("You can't use weapons."));
-        return false;
-    }
-
-    if (weapon->base_type == OBJ_ARMOUR)
-    {
-        SAY(mpr("You can't wield armour."));
-        return false;
-    }
-
-    if (weapon->base_type == OBJ_JEWELLERY)
-    {
-        SAY(mpr("You can't wield jewellery."));
+    if (!you.could_wield(*weapon, true, true, !say_reason))
         return false;
-    }
-
-    // Only ogres and trolls can wield giant clubs and large rocks (for
-    // sandblast).
-    if (you.body_size(PSIZE_TORSO, true) < SIZE_LARGE
-        && ((weapon->base_type == OBJ_WEAPONS
-             && (is_giant_club_type(weapon->sub_type)))
-             || (weapon->base_type == OBJ_MISSILES &&
-                 weapon->sub_type == MI_LARGE_ROCK)))
-    {
-        SAY(mpr("That's too large and heavy for you to wield."));
-        return false;
-    }
 
     // All non-weapons only need a shield check.
     if (weapon->base_type != OBJ_WEAPONS)
@@ -163,14 +136,6 @@ bool can_wield(item_def *weapon, bool say_reason,
             return true;
     }
 
-    // Small species wielding large weapons...
-    if (you.body_size(PSIZE_BODY) < SIZE_MEDIUM
-        && !is_weapon_wieldable(*weapon, you.body_size(PSIZE_BODY)))
-    {
-        SAY(mpr("That's too large for you to wield."));
-        return false;
-    }
-
     bool id_brand = false;
 
     if (you.undead_or_demonic() && is_holy_item(*weapon)