summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/makeitem.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/makeitem.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/makeitem.cc')
-rw-r--r--crawl-ref/source/makeitem.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc
index 6d4dad9682..fbca569df6 100644
--- a/crawl-ref/source/makeitem.cc
+++ b/crawl-ref/source/makeitem.cc
@@ -3186,7 +3186,7 @@ int items(int allow_uniques, // not just true-false,
}
// Note that item might be invalidated now, since p could have changed.
- ASSERT(is_valid_item(mitm[p]));
+ ASSERT(mitm[p].is_valid());
return (p);
}
@@ -3259,7 +3259,7 @@ static void _give_monster_item(monsters *mon, int thing,
return;
item_def &mthing = mitm[thing];
- ASSERT(is_valid_item(mthing));
+ ASSERT(mthing.is_valid());
#ifdef DEBUG_DIAGNOSTICS
mprf(MSGCH_DIAGNOSTICS,
@@ -3293,7 +3293,7 @@ static void _give_monster_item(monsters *mon, int thing,
destroy_item(thing, true);
return;
}
- if (!is_valid_item(mthing)) // missiles merged into an existing stack
+ if (!mthing.is_valid()) // missiles merged into an existing stack
return;
ASSERT(mthing.holding_monster() == mon);