From 7660cd4286c71f2d607930320e1fb93301ec54d6 Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Wed, 4 Nov 2009 12:06:43 -0600 Subject: Fix inconsistencies in checks for monsters' being slime creatures. --- crawl-ref/source/mon-abil.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'crawl-ref/source/mon-abil.cc') diff --git a/crawl-ref/source/mon-abil.cc b/crawl-ref/source/mon-abil.cc index 7b59a35691..3defd6aed2 100644 --- a/crawl-ref/source/mon-abil.cc +++ b/crawl-ref/source/mon-abil.cc @@ -362,7 +362,7 @@ static bool _slime_merge(monsters *thing) monsters *other_thing = monster_at(target); if (!merge_target && other_thing - && other_thing->mons_species() == MONS_SLIME_CREATURE + && other_thing->type == MONS_SLIME_CREATURE && other_thing->attitude == thing->attitude && other_thing->is_summoned() == thing->is_summoned() && !mons_is_shapeshifter(other_thing) @@ -426,7 +426,7 @@ bool slime_split_merge(monsters *thing) // No merging/splitting shapeshifters. if (!thing || mons_is_shapeshifter(thing) - || thing->mons_species() != MONS_SLIME_CREATURE) + || thing->type != MONS_SLIME_CREATURE) { return (false); } @@ -752,7 +752,7 @@ bool mon_special_ability(monsters *monster, bolt & beem) if ((!mons_near(monster) || monster->asleep() || monster->submerged()) - && monster->mons_species() != MONS_SLIME_CREATURE) + && monster->type != MONS_SLIME_CREATURE) { return (false); } -- cgit v1.2.3-54-g00ecf