diff options
| author | Vsevolod Kozlov <zaba@thorium.homeunix.org> | 2009-11-06 15:54:52 +0300 |
|---|---|---|
| committer | Jude Brown <bookofjude@users.sourceforge.net> | 2009-11-06 23:22:04 +1000 |
| commit | 8aaaca3d1c38a41d88b6dddf55fa48fd9aecb539 (patch) | |
| tree | 7e3d75c7a1f32cc41facc17d36986df022a5870a /crawl-ref/source/beam.cc | |
| parent | cddc002566e2f235a3785e12d534ebc0202bb53e (diff) | |
| download | crawl-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/beam.cc')
| -rw-r--r-- | crawl-ref/source/beam.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index af014304af..81500142cf 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -1569,7 +1569,7 @@ void bolt::initialise_fire() ASSERT(!name.empty() || is_tracer); ASSERT(in_bounds(source)); ASSERT(flavour > BEAM_NONE && flavour < BEAM_FIRST_PSEUDO); - ASSERT(!drop_item || item && is_valid_item(*item)); + ASSERT(!drop_item || item && item->is_valid()); ASSERT(range >= 0); ASSERT(!aimed_at_feet || source == target); @@ -3034,7 +3034,7 @@ bool bolt::stop_at_target() const void bolt::drop_object() { - ASSERT( item != NULL && is_valid_item(*item) ); + ASSERT( item != NULL && item->is_valid() ); // Conditions: beam is missile and not tracer. if (is_tracer || flavour != BEAM_MISSILE) @@ -5973,7 +5973,7 @@ std::string bolt::get_short_name() const if (!short_name.empty()) return (short_name); - if (item != NULL && is_valid_item(*item)) + if (item != NULL && item->is_valid()) return item->name(DESC_NOCAP_A, false, false, false, false, ISFLAG_IDENT_MASK | ISFLAG_COSMETIC_MASK | ISFLAG_RACIAL_MASK); |