diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-11-19 01:38:57 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-11-19 01:38:57 +0000 |
| commit | 7383236892148f6270c689f236fea8d437d554f1 (patch) | |
| tree | 167ffdb26153f24ef14edc71113f2a3d8138a829 /crawl-ref/source/fight.cc | |
| parent | 75521a519b8c5ee4252fa9b75306d718e6aed08a (diff) | |
| download | crawl-ref-7383236892148f6270c689f236fea8d437d554f1.tar.gz crawl-ref-7383236892148f6270c689f236fea8d437d554f1.zip | |
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
Diffstat (limited to 'crawl-ref/source/fight.cc')
| -rw-r--r-- | crawl-ref/source/fight.cc | 8 |
1 files changed, 4 insertions, 4 deletions
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; |