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/effects.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/effects.cc')
| -rw-r--r-- | crawl-ref/source/effects.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc index 9dbced7c40..fb50a9b7ad 100644 --- a/crawl-ref/source/effects.cc +++ b/crawl-ref/source/effects.cc @@ -2454,7 +2454,7 @@ static void _set_friendly_foes(bool allow_patrol = false) for (int i = 0; i < MAX_MONSTERS; ++i) { monsters *mon(&menv[i]); - if (!mon->alive() || !mons_near(mon) || !mons_friendly(mon) + if (!mon->alive() || !mons_near(mon) || !mon->friendly() || mon->mons_species() == MONS_GIANT_SPORE) { continue; @@ -2474,7 +2474,7 @@ static void _set_allies_patrol_point(bool clear = false) for (int i = 0; i < MAX_MONSTERS; ++i) { monsters *mon(&menv[i]); - if (!mon->alive() || !mons_near(mon) || !mons_friendly(mon)) + if (!mon->alive() || !mons_near(mon) || !mon->friendly()) continue; // Berserking monsters cannot be ordered around. |