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/beam.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/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 2650e495b6..1a6706447c 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -2234,7 +2234,7 @@ void bolt::do_fire() // sanctuary when pet_target can only be explicitly changed by // the player. const monsters *mon = &menv[beam_source]; - if (foe_info.hurt > 0 && !mons_wont_attack(mon) && !crawl_state.arena + if (foe_info.hurt > 0 && !mon->wont_attack() && !crawl_state.arena && you.pet_target == MHITNOT && env.sanctuary_time <= 0) { you.pet_target = beam_source; @@ -4547,7 +4547,7 @@ void bolt::monster_post_hit(monsters* mon, int dmg) // Don't annoy friendlies or good neutrals if the player's beam // did no damage. Hostiles will still take umbrage. - if (dmg > 0 || !mons_wont_attack(mon) || !YOU_KILL(thrower)) + if (dmg > 0 || !mon->wont_attack() || !YOU_KILL(thrower)) behaviour_event(mon, ME_ANNOY, beam_source_as_target()); // Sticky flame. @@ -5860,7 +5860,7 @@ bool bolt::nasty_to(const monsters *mon) const // Friendly and good neutral monsters don't mind being teleported. if (flavour == BEAM_TELEPORT) - return (!mons_wont_attack(mon)); + return (!mon->wont_attack()); // degeneration / sleep / enslave soul if (flavour == BEAM_DEGENERATE |