From 56c98916d5c67aa633b1a05d051e1c132723786c Mon Sep 17 00:00:00 2001 From: dolorous Date: Fri, 6 Feb 2009 01:21:21 +0000 Subject: Move the wielding exception for staves and lajatangs into check_weapon_wieldable_size(). git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8918 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/itemprop.cc | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'crawl-ref/source/itemprop.cc') 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. -- cgit v1.2.3-54-g00ecf