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/misc.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/misc.cc')
| -rw-r--r-- | crawl-ref/source/misc.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc index 64e2b9c7f0..55a02e4e43 100644 --- a/crawl-ref/source/misc.cc +++ b/crawl-ref/source/misc.cc @@ -2772,7 +2772,7 @@ bool mons_is_safe(const monsters *mon, bool want_move, { int dist = grid_distance(you.pos(), mon->pos()); - bool is_safe = (mons_wont_attack(mon) + bool is_safe = (mon->wont_attack() || mons_class_flag(mon->type, M_NO_EXP_GAIN) && mon->type != MONS_KRAKEN_TENTACLE || mons_is_pacified(mon) && dist > 1 @@ -3170,7 +3170,7 @@ bool stop_attack_prompt(const monsters *mon, bool beam_attack, const bool mon_target = (beam_target == mon->pos()); const bool inSanctuary = (is_sanctuary(you.pos()) || is_sanctuary(mon->pos())); - const bool wontAttack = mons_wont_attack(mon); + const bool wontAttack = mon->wont_attack(); const bool isFriendly = mon->friendly(); const bool isNeutral = mon->neutral(); const bool isUnchivalric = is_unchivalric_attack(&you, mon); |