diff options
| author | Neil Moore <neil@s-z.org> | 2012-03-22 03:05:28 -0400 |
|---|---|---|
| committer | Neil Moore <neil@s-z.org> | 2012-03-22 03:25:31 -0400 |
| commit | 900e01d22f554e0e9ba3ad43f7947b6ae12cbeea (patch) | |
| tree | c6eaacc88758c9f34f808b162d2332a30f9fba73 /crawl-ref/source/mon-clone.cc | |
| parent | ac7c8031638fafe5a45580c4b01a79008db21b16 (diff) | |
| download | crawl-ref-900e01d22f554e0e9ba3ad43f7947b6ae12cbeea.tar.gz crawl-ref-900e01d22f554e0e9ba3ad43f7947b6ae12cbeea.zip | |
Don't call foo->is_player() on a null pointer.
Many of the instances of (foo == &you) were in contexts where foo could
be NULL. In those cases, include a test for foo being non-null.
Also, remove a few now-useless assertions; and add assertions to a few
cases that require but do not check for non-NULL pointers.
Fixes #5471.
Diffstat (limited to 'crawl-ref/source/mon-clone.cc')
| -rw-r--r-- | crawl-ref/source/mon-clone.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/crawl-ref/source/mon-clone.cc b/crawl-ref/source/mon-clone.cc index 66cc1f135d..c503555dbb 100644 --- a/crawl-ref/source/mon-clone.cc +++ b/crawl-ref/source/mon-clone.cc @@ -78,14 +78,9 @@ static bool _player_is_illusion_cloneable() bool actor_is_illusion_cloneable(actor *target) { if (target->is_player()) - { - ASSERT(target->is_player()); return _player_is_illusion_cloneable(); - } else - { return _mons_is_illusion_cloneable(target->as_monster()); - } } static void _mons_summon_monster_illusion(monster* caster, @@ -195,7 +190,6 @@ void mons_summon_illusion_from(monster* mons, actor *foe, { if (foe->is_player()) { - ASSERT(foe->is_player()); if (monster *clone = create_monster( mgen_data(MONS_PLAYER_ILLUSION, SAME_ATTITUDE(mons), mons, 6, spell_cast, mons->pos(), mons->foe, 0))) |