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/attitude-change.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/attitude-change.cc')
| -rw-r--r-- | crawl-ref/source/attitude-change.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/attitude-change.cc b/crawl-ref/source/attitude-change.cc index 0f3ba57b41..953bd164bb 100644 --- a/crawl-ref/source/attitude-change.cc +++ b/crawl-ref/source/attitude-change.cc @@ -77,7 +77,7 @@ void beogh_follower_convert(monsters *monster, bool orc_hit) && !mons_is_summoned(monster) && !mons_is_shapeshifter(monster) && !testbits(monster->flags, MF_ATT_CHANGE_ATTEMPT) - && !mons_friendly(monster) + && !monster->friendly() && you.visible_to(monster) && !monster->asleep() && !mons_is_confused(monster) && !monster->paralysed()) { @@ -111,7 +111,7 @@ void slime_convert(monsters* monster) && !mons_is_summoned(monster) && !mons_is_shapeshifter(monster) && !mons_neutral(monster) - && !mons_friendly(monster) + && !monster->friendly() && !testbits(monster->flags, MF_ATT_CHANGE_ATTEMPT) && you.visible_to(monster) && !monster->asleep() && !mons_is_confused(monster) && !monster->paralysed()) |