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/output.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/output.cc')
| -rw-r--r-- | crawl-ref/source/output.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc index ca122c3237..8b0d4e9adb 100644 --- a/crawl-ref/source/output.cc +++ b/crawl-ref/source/output.cc @@ -1086,7 +1086,7 @@ void draw_border(void) static bool _mons_hostile(const monsters *mon) { - return (!mons_friendly(mon) && !mons_neutral(mon)); + return (!mon->friendly() && !mons_neutral(mon)); } static std::string _get_monster_name(const monster_info& m, @@ -1096,7 +1096,7 @@ static std::string _get_monster_name(const monster_info& m, const monsters *mon = m.m_mon; bool adj = false; - if (mons_friendly(mon)) + if (mon->friendly()) { desc += "friendly "; adj = true; @@ -1138,13 +1138,13 @@ bool compare_monsters_attitude( const monsters *m1, const monsters *m2 ) if (mons_neutral(m1)) { - if (mons_friendly(m2)) + if (m2->friendly()) return (true); if (_mons_hostile(m2)) return (false); } - if (mons_friendly(m1) && !mons_friendly(m2)) + if (m1->friendly() && !m2->friendly()) return (false); // If we get here then monsters have the same attitude. |