diff options
| author | Robert Vollmert <rvollmert@gmx.net> | 2009-10-22 18:45:59 +0200 |
|---|---|---|
| committer | Robert Vollmert <rvollmert@gmx.net> | 2009-10-22 22:37:08 +0200 |
| commit | 8d4d79655dd503417920299808993cef658bdde0 (patch) | |
| tree | 3b1ca5a659541ba1dae36bfd1e8f6087d88df7d0 /crawl-ref/source/monstuff.cc | |
| parent | fd1958001336bef983dfdfc951735c6e628d3ab7 (diff) | |
| download | crawl-ref-8d4d79655dd503417920299808993cef658bdde0.tar.gz crawl-ref-8d4d79655dd503417920299808993cef658bdde0.zip | |
Fold mon_can_see_monster and mons_monster_visible into monsters.
Diffstat (limited to 'crawl-ref/source/monstuff.cc')
| -rw-r--r-- | crawl-ref/source/monstuff.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index 29cc7d5906..e73bdfb52c 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -4496,7 +4496,7 @@ static void _handle_behaviour(monsters *mon) { proxFoe = mons_near(mon, mon->foe); - if (!mon_can_see_monster(mon, &menv[mon->foe])) + if (!mon->can_see( &menv[mon->foe])) proxFoe = false; foepos = menv[mon->foe].pos(); @@ -4841,7 +4841,7 @@ static bool _mons_check_set_foe(monsters *mon, const coord_def& p, if (monsters *foe = monster_at(p)) { if (foe != mon - && mon_can_see_monster(mon, foe) + && mon->can_see(foe) && (friendly || !is_sanctuary(p)) && (mons_friendly(foe) != friendly || (neutral && !mons_neutral(foe)))) @@ -7083,8 +7083,7 @@ static bool _handle_spell(monsters *monster, bolt &beem) spellOK = false; } } - else if (!mon_can_see_monster(monster, - &menv[monster->foe])) + else if (!monster->can_see(&menv[monster->foe])) { spellOK = false; } |