diff options
| author | Vsevolod Kozlov <zaba@thorium.homeunix.org> | 2009-11-09 14:33:06 +0300 |
|---|---|---|
| committer | Vsevolod Kozlov <zaba@thorium.homeunix.org> | 2009-11-09 14:58:19 +0300 |
| commit | 9338556ebf846bbc4176134e3846ef6699e8434b (patch) | |
| tree | 2107949166730a765e3e1e98a66778f112fb5e6a /crawl-ref/source/fight.cc | |
| parent | bf03515e22d610f81afa6d4153afc383f7331363 (diff) | |
| download | crawl-ref-9338556ebf846bbc4176134e3846ef6699e8434b.tar.gz crawl-ref-9338556ebf846bbc4176134e3846ef6699e8434b.zip | |
Replace mons_wont_attack with monsters::wont_attack.
Diffstat (limited to 'crawl-ref/source/fight.cc')
| -rw-r--r-- | crawl-ref/source/fight.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index fb21540279..5775f0ab6a 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -4261,7 +4261,7 @@ bool melee_attack::mons_attack_mons() if (perceived_attack && attacker->alive() && defender_as_monster()->friendly() && !crawl_state.arena - && !mons_wont_attack(attacker_as_monster()) + && !attacker_as_monster()->wont_attack() && you.pet_target == MHITNOT && env.sanctuary_time <= 0) { @@ -5729,7 +5729,7 @@ bool monster_attack(monsters* attacker, bool allow_unarmed) ASSERT(!crawl_state.arena); // Friendly and good neutral monsters won't attack unless confused. - if (mons_wont_attack(attacker) && !mons_is_confused(attacker)) + if (attacker->wont_attack() && !mons_is_confused(attacker)) return (false); // In case the monster hasn't noticed you, bumping into it will |