summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/monster.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/monster.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/monster.cc')
-rw-r--r--crawl-ref/source/monster.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/monster.cc b/crawl-ref/source/monster.cc
index ae8454746d..4d02e431b3 100644
--- a/crawl-ref/source/monster.cc
+++ b/crawl-ref/source/monster.cc
@@ -587,7 +587,7 @@ bool monsters::can_wield(const item_def& item, bool ignore_curse,
bool monsters::could_wield(const item_def &item, bool ignore_brand,
bool /* ignore_transform */) const
{
- ASSERT(is_valid_item(item));
+ ASSERT(item.is_valid());
// These *are* weapons, so they can't wield another weapon.
if (type == MONS_DANCING_WEAPON)
@@ -983,7 +983,7 @@ void monsters::pickup_message(const item_def &item, int near)
bool monsters::pickup(item_def &item, int slot, int near, bool force_merge)
{
- ASSERT(is_valid_item(item));
+ ASSERT(item.is_valid());
const monsters *other_mon = item.holding_monster();