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/monplace.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/monplace.cc')
| -rw-r--r-- | crawl-ref/source/monplace.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/monplace.cc b/crawl-ref/source/monplace.cc index 278dc511b0..942e4ac4af 100644 --- a/crawl-ref/source/monplace.cc +++ b/crawl-ref/source/monplace.cc @@ -3265,7 +3265,7 @@ bool monster_pathfind::mons_traversable(const coord_def p) // Your friends only know about doors you know about, unless they feel // at home in this branch. - if (grd(p) == DNGN_SECRET_DOOR && mons_friendly(mons) + if (grd(p) == DNGN_SECRET_DOOR && mons->friendly() && (mons_intel(mons) < I_NORMAL || !mons_is_native_in_branch(mons))) { return (false); @@ -3279,7 +3279,7 @@ bool monster_pathfind::mons_traversable(const coord_def p) // Don't allow allies to pass over known (to them) Zot traps. if (tt == TRAP_ZOT && ptrap->is_known(mons) - && mons_friendly(mons)) + && mons->friendly()) { return (false); } @@ -3336,7 +3336,7 @@ int monster_pathfind::mons_travel_cost(coord_def npos) { // Your allies take extra precautions to avoid known alarm traps. // Zot traps are considered intraversable. - if (knows_trap && mons_friendly(mons)) + if (knows_trap && mons->friendly()) return (3); // To hostile monsters, these traps are completely harmless. |