summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/player.cc
diff options
context:
space:
mode:
authorVsevolod Kozlov <zaba@thorium.homeunix.org>2009-11-06 15:54:52 +0300
committerJude Brown <bookofjude@users.sourceforge.net>2009-11-06 23:22:04 +1000
commit8aaaca3d1c38a41d88b6dddf55fa48fd9aecb539 (patch)
tree7e3d75c7a1f32cc41facc17d36986df022a5870a /crawl-ref/source/player.cc
parentcddc002566e2f235a3785e12d534ebc0202bb53e (diff)
downloadcrawl-ref-8aaaca3d1c38a41d88b6dddf55fa48fd9aecb539.tar.gz
crawl-ref-8aaaca3d1c38a41d88b6dddf55fa48fd9aecb539.zip
Rename is_valid_item to item_def::is_valid.
Signed-off-by: Jude Brown <bookofjude@users.sourceforge.net>
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])
{