diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-11-07 01:06:44 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-11-07 01:06:44 +0000 |
| commit | 023a42be1a29fba79faf5d0606ac8a4c6b648409 (patch) | |
| tree | 11dceee2fce847fd235cdc38775882cfdd67269b /crawl-ref/source/item_use.cc | |
| parent | a5248544dcc3d81873bd8e9cddad3dded307083d (diff) | |
| download | crawl-ref-023a42be1a29fba79faf5d0606ac8a4c6b648409.tar.gz crawl-ref-023a42be1a29fba79faf5d0606ac8a4c6b648409.zip | |
Properly allow small races to use staves again (oops), and handle all
staff-type weapons consistently.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7394 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/item_use.cc')
| -rw-r--r-- | crawl-ref/source/item_use.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index ea0e408f98..87b103d7f5 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -133,6 +133,7 @@ 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.")); @@ -414,7 +415,7 @@ void warn_shield_penalties() else if (is_range_weapon(*weapon)) warn_launcher_shield_slowdown(*weapon); else if (weapon->base_type == OBJ_WEAPONS - && weapon->sub_type == WPN_QUARTERSTAFF) + && weapon_skill(*weapon) == SK_STAVES) { mprf(MSGCH_WARN, "Your %s severely limits your weapon's effectiveness.", shield_base_name(player_shield())); |