diff options
author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-09-17 22:04:34 +0000 |
---|---|---|
committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-09-17 22:04:34 +0000 |
commit | aeb4ec07c472d019e92cd769bbd6484439aa7f86 (patch) | |
tree | 03c4c044279ea4ce43e39311cf820d5b4237adc5 /crawl-ref/source/monstuff.cc | |
parent | d636d3368b6441379025477373212cd203fe16bf (diff) | |
download | crawl-ref-aeb4ec07c472d019e92cd769bbd6484439aa7f86.tar.gz crawl-ref-aeb4ec07c472d019e92cd769bbd6484439aa7f86.zip |
Add a check for whether a monster with water habitat can reach the
player and only consider such monster unsafe if there is a path. Replace
the old runrest_ignore_monster checks for aquatic monsters with this
one, which has the side effect of being nicer to Merfolk.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10701 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/monstuff.cc')
-rw-r--r-- | crawl-ref/source/monstuff.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index a7f15367a1..358b1da0c2 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -1220,7 +1220,7 @@ void mons_relocated(monsters *monster) else if (monster->type == MONS_KRAKEN_TENTACLE) { if (invalid_monster_index(monster->number) - || menv[monster->number].type!=MONS_KRAKEN + || menv[monster->number].type != MONS_KRAKEN || _tentacle_too_far(&menv[monster->number], monster)) { monster_die(monster, KILL_RESET, -1, true, false); |