summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/player.cc
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/player.cc')
-rw-r--r--crawl-ref/source/player.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index e178cc0523..43b57b5886 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -779,7 +779,7 @@ bool berserk_check_wielded_weapon()
return (true);
const item_def weapon = *you.weapon();
- if (is_valid_item(weapon) && weapon.base_type != OBJ_STAVES
+ if (weapon.is_valid() && weapon.base_type != OBJ_STAVES
&& (weapon.base_type != OBJ_WEAPONS || is_range_weapon(weapon))
|| you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED])
{