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/stuff.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/stuff.cc')
| -rw-r--r-- | crawl-ref/source/stuff.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/stuff.cc b/crawl-ref/source/stuff.cc index 691f50748a..4efd5e7839 100644 --- a/crawl-ref/source/stuff.cc +++ b/crawl-ref/source/stuff.cc @@ -190,7 +190,7 @@ static bool _tag_follower_at(const coord_def &pos) // Only friendly monsters, or those actively seeking the // player, will follow up/down stairs. - if (!mons_friendly(fmenv) + if (!fmenv->friendly() && (!mons_is_seeking(fmenv) || fmenv->foe != MHITYOU)) { return (false); @@ -200,7 +200,7 @@ static bool _tag_follower_at(const coord_def &pos) // stringent checks. if ((pos - you.pos()).abs() > 2) { - if (!mons_friendly(fmenv)) + if (!fmenv->friendly()) return (false); // Undead will follow Yredelemnul worshippers, and orcs will @@ -235,7 +235,7 @@ static int follower_tag_radius2() for (adjacent_iterator ai; ai; ++ai) { if (const monsters *mon = monster_at(*ai)) - if (!mons_friendly(mon)) + if (!mon->friendly()) return (2); } |