diff options
| author | Eino Keskitalo <evktalo@users.sourceforge.net> | 2009-11-07 16:30:52 +0200 |
|---|---|---|
| committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-07 23:21:21 -0600 |
| commit | 1c0a611a9e00fc789a8e71f1423e48bec7dd5020 (patch) | |
| tree | b73d3be502e13ec1bb56e89e5382fd14f71a74ba /crawl-ref/source/mon-abil.cc | |
| parent | ee4d8d69cdded564187651f879b618a4fc2538f9 (diff) | |
| download | crawl-ref-1c0a611a9e00fc789a8e71f1423e48bec7dd5020.tar.gz crawl-ref-1c0a611a9e00fc789a8e71f1423e48bec7dd5020.zip | |
Merge from chaotic_experiment branch:
Replace mons_is_shapeshifter(const monsters *m) in mon-util.cc with is_shapeshifter() in monster.cc
Diffstat (limited to 'crawl-ref/source/mon-abil.cc')
| -rw-r--r-- | crawl-ref/source/mon-abil.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/mon-abil.cc b/crawl-ref/source/mon-abil.cc index 0c62f719e0..82f49ffbeb 100644 --- a/crawl-ref/source/mon-abil.cc +++ b/crawl-ref/source/mon-abil.cc @@ -380,7 +380,7 @@ static bool _slime_merge(monsters *thing) && other_thing->type == MONS_SLIME_CREATURE && other_thing->attitude == thing->attitude && other_thing->is_summoned() == thing->is_summoned() - && !mons_is_shapeshifter(other_thing) + && !other_thing->is_shapeshifter() && !_disabled_slime(other_thing)) { // We can potentially merge if doing so won't take us over @@ -440,7 +440,7 @@ bool slime_split_merge(monsters *thing) { // No merging/splitting shapeshifters. if (!thing - || mons_is_shapeshifter(thing) + || thing->is_shapeshifter() || thing->type != MONS_SLIME_CREATURE) { return (false); |