diff options
Diffstat (limited to 'crawl-ref/source/religion.cc')
-rw-r--r-- | crawl-ref/source/religion.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index e5523f698a..f19a9966c8 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -782,9 +782,7 @@ bool is_tso_follower(const monsters* mon) { // Don't check for evil or unholy allies here, as that's done // elsewhere. - return (mon->alive() - && (mon->attitude == ATT_FRIENDLY - || mon->has_ench(ENCH_CHARM))); + return (mon->alive() && mons_friendly(mon)); } bool is_orcish_follower(const monsters* mon) @@ -809,6 +807,8 @@ bool is_follower(const monsters* mon) break; default: + // Currently, this is identical to is_tso_follower(). + result = (mon->alive() && mons_friendly(mon)); break; } |