From b4b8747ec41b3fa6543d7c51e02515b0cec1496f Mon Sep 17 00:00:00 2001 From: Vsevolod Kozlov Date: Fri, 6 Nov 2009 19:46:32 +0300 Subject: Move mons_is_friendly to monsters::friendly. Signed-off-by: Robert Vollmert --- crawl-ref/source/tutorial.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'crawl-ref/source/tutorial.cc') diff --git a/crawl-ref/source/tutorial.cc b/crawl-ref/source/tutorial.cc index 1ced3d7729..978ba69c17 100644 --- a/crawl-ref/source/tutorial.cc +++ b/crawl-ref/source/tutorial.cc @@ -1208,7 +1208,7 @@ static std::string _colourize_glyph(int col, unsigned glyph) static bool _mons_is_highlighted(const monsters *mons) { - return (mons_friendly(mons) + return (mons->friendly() && Options.friend_brand != CHATTR_NORMAL || mons_looks_stabbable(mons) && Options.stab_brand != CHATTR_NORMAL @@ -1273,7 +1273,7 @@ void tutorial_first_monster(const monsters &mon) if (_mons_is_highlighted(&mon)) learned_something_new(TUT_MONSTER_BRAND, mon.pos()); - if (mons_friendly(&mon)) + if (mon.friendly()) learned_something_new(TUT_MONSTER_FRIENDLY, mon.pos()); if (you.religion == GOD_TROG && !you.duration[DUR_BERSERKER] @@ -1390,7 +1390,7 @@ void tutorial_first_monster(const monsters &mon) if (_mons_is_highlighted(&mon)) learned_something_new(TUT_MONSTER_BRAND, mon.pos()); - if (mons_friendly(&mon)) + if (mon.friendly()) learned_something_new(TUT_MONSTER_FRIENDLY, mon.pos()); } @@ -4532,7 +4532,7 @@ void tutorial_describe_monster(const monsters *mons) } // Monster is highlighted. - if (mons_friendly(mons)) + if (mons->friendly()) { ostr << "Friendly monsters will follow you around and attempt to aid " "you in battle. You can order your allies by talking " -- cgit v1.2.3-54-g00ecf