diff options
| author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-04 12:06:43 -0600 |
|---|---|---|
| committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-04 12:06:43 -0600 |
| commit | 7660cd4286c71f2d607930320e1fb93301ec54d6 (patch) | |
| tree | 235db5a8068322f3f858b04cd3d56c64b83c8cd8 /crawl-ref/source/mon-abil.cc | |
| parent | b912a934aeb468161597059b85c7b67c6def8621 (diff) | |
| download | crawl-ref-7660cd4286c71f2d607930320e1fb93301ec54d6.tar.gz crawl-ref-7660cd4286c71f2d607930320e1fb93301ec54d6.zip | |
Fix inconsistencies in checks for monsters' being slime creatures.
Diffstat (limited to 'crawl-ref/source/mon-abil.cc')
| -rw-r--r-- | crawl-ref/source/mon-abil.cc | 6 |
1 files changed, 3 insertions, 3 deletions
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); } |