summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/itemprop.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-02-06 01:21:21 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-02-06 01:21:21 +0000
commit56c98916d5c67aa633b1a05d051e1c132723786c (patch)
treea6001689bc2765cf41f5b6c32b88656a203f6457 /crawl-ref/source/itemprop.cc
parent7ddac74599b51e7af9f9ca635ec7b7b037ce0f03 (diff)
downloadcrawl-ref-56c98916d5c67aa633b1a05d051e1c132723786c.tar.gz
crawl-ref-56c98916d5c67aa633b1a05d051e1c132723786c.zip
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
Diffstat (limited to 'crawl-ref/source/itemprop.cc')
-rw-r--r--crawl-ref/source/itemprop.cc4
1 files changed, 4 insertions, 0 deletions
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.