diff options
Diffstat (limited to 'crawl-ref/source/mon-act.cc')
| -rw-r--r-- | crawl-ref/source/mon-act.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/mon-act.cc b/crawl-ref/source/mon-act.cc index 77afabed25..0c6c0648f9 100644 --- a/crawl-ref/source/mon-act.cc +++ b/crawl-ref/source/mon-act.cc @@ -121,7 +121,7 @@ static bool _swap_monsters(monsters* mover, monsters* moved) // A friendly or good-neutral monster moving past a fleeing hostile // or neutral monster, or vice versa. - if (mons_wont_attack_real(mover) == mons_wont_attack_real(moved) + if (mons_wont_attack(mover) == mons_wont_attack(moved) || mons_is_fleeing(mover) == mons_is_fleeing(moved)) { return (false); @@ -255,7 +255,7 @@ static bool _allied_monster_at(monsters *mon, coord_def a, coord_def b, // Hostile monsters of normal intelligence only move aside for // monsters of the same genus. - if (mons_intel(mon) <= I_NORMAL && !mons_wont_attack_real(mon) + if (mons_intel(mon) <= I_NORMAL && !mons_wont_attack(mon) && mons_genus(mon->type) != mons_genus(ally->type)) { continue; @@ -558,7 +558,7 @@ static void _handle_movement(monsters *monster) coord_def(-mmov.x, 0), coord_def(-mmov.x, 1)) || mons_intel(monster) >= I_NORMAL - && !mons_wont_attack_real(monster) + && !mons_wont_attack(monster) && _ranged_allied_monster_in_dir(monster, coord_def(-mmov.x, 0)))) { @@ -576,7 +576,7 @@ static void _handle_movement(monsters *monster) coord_def(0, -mmov.y), coord_def(1, -mmov.y)) || mons_intel(monster) >= I_NORMAL - && !mons_wont_attack_real(monster) + && !mons_wont_attack(monster) && _ranged_allied_monster_in_dir(monster, coord_def(0, -mmov.y)))) { @@ -595,7 +595,7 @@ static void _handle_movement(monsters *monster) coord_def(-mmov.x, 0), coord_def(-mmov.x, 1)) || mons_intel(monster) >= I_NORMAL - && !mons_wont_attack_real(monster) + && !mons_wont_attack(monster) && _ranged_allied_monster_in_dir(monster, coord_def(-mmov.x, -mmov.y)))) { @@ -607,7 +607,7 @@ static void _handle_movement(monsters *monster) coord_def(0, -mmov.y), coord_def(1, -mmov.y)) || mons_intel(monster) >= I_NORMAL - && !mons_wont_attack_real(monster) + && !mons_wont_attack(monster) && _ranged_allied_monster_in_dir(monster, coord_def(-mmov.x, -mmov.y)))) { |