diff options
| author | Vsevolod Kozlov <zaba@thorium.homeunix.org> | 2009-11-06 19:46:32 +0300 |
|---|---|---|
| committer | Robert Vollmert <rvollmert@gmx.net> | 2009-11-06 19:52:58 +0100 |
| commit | b4b8747ec41b3fa6543d7c51e02515b0cec1496f (patch) | |
| tree | efb1625c80d595b58b8bde933decd1dfc674ee04 /crawl-ref/source/religion.cc | |
| parent | 22adbee6a63d3fb1ee05d0e6ff41e80e95b4afc7 (diff) | |
| download | crawl-ref-b4b8747ec41b3fa6543d7c51e02515b0cec1496f.tar.gz crawl-ref-b4b8747ec41b3fa6543d7c51e02515b0cec1496f.zip | |
Move mons_is_friendly to monsters::friendly.
Signed-off-by: Robert Vollmert <rvollmert@gmx.net>
Diffstat (limited to 'crawl-ref/source/religion.cc')
| -rw-r--r-- | crawl-ref/source/religion.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index f0984b4607..64ff727b1c 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -1465,12 +1465,12 @@ bool _has_jelly() bool is_good_lawful_follower(const monsters* mon) { return (mon->alive() && !mon->is_evil() && !mon->is_chaotic() - && mons_friendly(mon)); + && mon->friendly()); } bool is_good_follower(const monsters* mon) { - return (mon->alive() && !mon->is_evil() && mons_friendly(mon)); + return (mon->alive() && !mon->is_evil() && mon->friendly()); } bool is_follower(const monsters* mon) @@ -1488,7 +1488,7 @@ bool is_follower(const monsters* mon) else if (is_good_god(you.religion)) return (is_good_follower(mon)); else - return (mon->alive() && mons_friendly(mon)); + return (mon->alive() && mon->friendly()); } static bool _blessing_wpn(monsters* mon) @@ -3564,7 +3564,7 @@ void set_attack_conducts(god_conduct_trigger conduct[3], const monsters *mon, { const unsigned int midx = monster_index(mon); - if (mons_friendly(mon)) + if (mon->friendly()) { if ((mon->flags & NEW_GIFT_FLAGS) == NEW_GIFT_FLAGS && mon->god != GOD_XOM) |