summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mon-behv.cc
diff options
context:
space:
mode:
authorShmuale Mark <shm.mark@gmail.com>2014-06-27 12:40:51 -0400
committerShmuale Mark <shm.mark@gmail.com>2014-06-27 12:40:51 -0400
commit7df3b236cd1e0499b02dda266d39e7be2362b5f5 (patch)
tree270f63be5be967b69bc416965a58b79a9d781a13 /crawl-ref/source/mon-behv.cc
parenta13f14e4cf0c08a88c5606d30172d9a4fac625cf (diff)
downloadcrawl-ref-7df3b236cd1e0499b02dda266d39e7be2362b5f5.tar.gz
crawl-ref-7df3b236cd1e0499b02dda266d39e7be2362b5f5.zip
Make charmed range maintainers follow the player normally (and into).
Diffstat (limited to 'crawl-ref/source/mon-behv.cc')
-rw-r--r--crawl-ref/source/mon-behv.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/mon-behv.cc b/crawl-ref/source/mon-behv.cc
index 396c0178e0..1cae3292e2 100644
--- a/crawl-ref/source/mon-behv.cc
+++ b/crawl-ref/source/mon-behv.cc
@@ -693,11 +693,11 @@ void handle_behaviour(monster* mon)
{
// The foe is the player.
if (mons_class_flag(mon->type, M_MAINTAIN_RANGE)
- && !mon->berserk_or_insane())
+ && !mon->berserk_or_insane()
+ && !mon->friendly())
{
- if (mon->attitude != ATT_FRIENDLY)
- // Get to firing range even if we are close.
- _set_firing_pos(mon, you.pos());
+ // Get to firing range even if we are close.
+ _set_firing_pos(mon, you.pos());
}
else if (mon->type == MONS_SIREN)
find_siren_water_target(mon);