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/tutorial.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/tutorial.cc')
| -rw-r--r-- | crawl-ref/source/tutorial.cc | 8 |
1 files changed, 4 insertions, 4 deletions
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 <w>t</w>alking " |