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/beam.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/beam.cc')
| -rw-r--r-- | crawl-ref/source/beam.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 95d2be232a..41736c6b16 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -127,7 +127,7 @@ kill_category bolt::whose_kill() const if (!invalid_monster_index(beam_source)) { const monsters *mon = &menv[beam_source]; - if (mons_friendly(mon)) + if (mon->friendly()) return (KC_FRIENDLY); } } @@ -2556,7 +2556,7 @@ static bool _monster_resists_mass_enchantment(monsters *monster, // Assuming that the only mass charm is control undead. if (wh_enchant == ENCH_CHARM) { - if (mons_friendly(monster)) + if (monster->friendly()) return (true); if (monster->holiness() != MH_UNDEAD) @@ -4947,7 +4947,7 @@ bool _ench_flavour_affects_monster(beam_type flavour, const monsters* mon) break; case BEAM_ENSLAVE_DEMON: - rc = (mon->holiness() == MH_DEMONIC && !mons_friendly(mon)); + rc = (mon->holiness() == MH_DEMONIC && !mon->friendly()); break; case BEAM_PAIN: |