diff options
| -rw-r--r-- | crawl-ref/source/item_use.cc | 1 | ||||
| -rw-r--r-- | crawl-ref/source/itemprop.cc | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index c2e12a86d1..266d4fef52 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -136,7 +136,6 @@ bool can_wield(item_def *weapon, bool say_reason, // Small species wielding large weapons... if (player_size(PSIZE_BODY) < SIZE_MEDIUM - && weapon_skill(*weapon) != SK_STAVES && !check_weapon_wieldable_size(*weapon, player_size(PSIZE_BODY))) { SAY(mpr("That's too large for you to wield.")); diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc index 35d4dfeacb..c23cd5dd0f 100644 --- a/crawl-ref/source/itemprop.cc +++ b/crawl-ref/source/itemprop.cc @@ -2026,6 +2026,10 @@ bool check_weapon_wieldable_size( const item_def &item, size_type size ) { ASSERT( item.base_type == OBJ_WEAPONS || item.base_type == OBJ_STAVES ); + // Staves are currently wieldable for everyone just to be nice. + if (item.base_type == OBJ_STAVES || weapon_skill(item) == SK_STAVES) + return (true); + int fit = fit_weapon_wieldable_size( item, size ); // Adjust fit for size. |