From 7383236892148f6270c689f236fea8d437d554f1 Mon Sep 17 00:00:00 2001 From: dolorous Date: Wed, 19 Nov 2008 01:38:57 +0000 Subject: Add more consistency fixes for staves. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7492 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/fight.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'crawl-ref/source/fight.cc') diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index 67c88e6dd1..794e264666 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -1044,7 +1044,7 @@ bool melee_attack::player_aux_unarmed() || (weapon && hands == HANDS_TWO && weapon->base_type != OBJ_STAVES - && weapon->sub_type != WPN_QUARTERSTAFF) ) + && weapon_skill(*weapon) != SK_STAVES)) { continue; } @@ -3070,10 +3070,10 @@ int melee_attack::player_calc_base_weapon_damage() if (weapon->base_type == OBJ_WEAPONS || item_is_staff( *weapon )) damage = property( *weapon, PWPN_DAMAGE ); - // Quarterstaves can be wielded with a worn shield, but are much - // less effective. + // Staves can be wielded with a worn shield, but are much less + // effective. if (shield && weapon->base_type == OBJ_WEAPONS - && weapon->sub_type == WPN_QUARTERSTAFF + && weapon_skill(*weapon) == SK_STAVES && hands_reqd(*weapon, player_size()) == HANDS_HALF) { damage /= 2; -- cgit v1.2.3-54-g00ecf