summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/fight.cc
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-03-11 18:37:09 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-03-11 18:37:09 +0000
commitb884e880ac8d5a06b6c086ed09fe6595df543cac (patch)
tree0941017e25f2c0a70c2ac0196cef55419d207ecb /crawl-ref/source/fight.cc
parent0f60b03a1cb88a61c14bf38c332944bdae2abd71 (diff)
downloadcrawl-ref-b884e880ac8d5a06b6c086ed09fe6595df543cac.tar.gz
crawl-ref-b884e880ac8d5a06b6c086ed09fe6595df543cac.zip
Fixed bogus auto-id of magical staves in combat (Erik).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1021 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/fight.cc')
-rw-r--r--crawl-ref/source/fight.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index dadb00a351..7d92cc8417 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -996,6 +996,7 @@ int melee_attack::player_apply_weapon_bonuses(int damage)
void melee_attack::player_weapon_auto_id()
{
if (weapon
+ && weapon->base_type == OBJ_WEAPONS
&& !is_range_weapon( *weapon )
&& !item_ident( *weapon, ISFLAG_KNOW_PLUSES )
&& random2(100) < you.skills[ wpn_skill ])