summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/output.cc
diff options
context:
space:
mode:
authorVsevolod Kozlov <zaba@thorium.homeunix.org>2009-11-07 12:33:40 +0300
committerJude Brown <bookofjude@users.sourceforge.net>2009-11-07 19:52:53 +1000
commit3232b4719ebfaccae12c628b01c6ca37ad38254e (patch)
treee95548b672dddc54a27c8fe3124809a82ef0b914 /crawl-ref/source/output.cc
parent19c21942c0fd98b8034920f9bebd96bc8a8a5261 (diff)
downloadcrawl-ref-3232b4719ebfaccae12c628b01c6ca37ad38254e.tar.gz
crawl-ref-3232b4719ebfaccae12c628b01c6ca37ad38254e.zip
Replace mons_neutral with monsters::neutral.
Signed-off-by: Jude Brown <bookofjude@users.sourceforge.net>
Diffstat (limited to 'crawl-ref/source/output.cc')
-rw-r--r--crawl-ref/source/output.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc
index c1c22bc802..605a20edfd 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 (!mon->friendly() && !mons_neutral(mon));
+ return (!mon->friendly() && !mon->neutral());
}
static std::string _get_monster_name(const monster_info& m,
@@ -1101,7 +1101,7 @@ static std::string _get_monster_name(const monster_info& m,
desc += "friendly ";
adj = true;
}
- else if (mons_neutral(mon))
+ else if (mon->neutral())
{
desc += "neutral ";
adj = true;
@@ -1136,7 +1136,7 @@ bool compare_monsters_attitude( const monsters *m1, const monsters *m2 )
if (_mons_hostile(m1) && !_mons_hostile(m2))
return (true);
- if (mons_neutral(m1))
+ if (m1->neutral())
{
if (m2->friendly())
return (true);