summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-03-03 20:17:49 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-03-03 20:17:49 +0000
commita615f8180b1c4ed6b6e055f1a5fdc24737af5d14 (patch)
tree7d88b397a57de9ef2f7a7c2cdc4289bb31baaeaa
parent46a94fe9c1f983411a9fd0ec5db057806cc98ae3 (diff)
downloadcrawl-ref-a615f8180b1c4ed6b6e055f1a5fdc24737af5d14.tar.gz
crawl-ref-a615f8180b1c4ed6b6e055f1a5fdc24737af5d14.zip
Tweak sanctuaries' influence on monsters, now that giant spores have
MH_PLANT holiness and aren't stationary. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9326 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/mon-util.cc3
-rw-r--r--crawl-ref/source/monstuff.cc3
2 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index 211a01ea19..5979e6cca8 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -2653,8 +2653,7 @@ bool mons_is_lurking(const monsters *m)
bool mons_is_influenced_by_sanctuary(const monsters *m)
{
return (!mons_wont_attack(m)
- && mons_holiness(m) != MH_PLANT
- && !mons_is_stationary(m));
+ && (mons_holiness(m) != MH_PLANT || mons_is_stationary(m)));
}
bool mons_is_fleeing_sanctuary(const monsters *m)
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc
index 96bd0477f0..210000b566 100644
--- a/crawl-ref/source/monstuff.cc
+++ b/crawl-ref/source/monstuff.cc
@@ -7068,7 +7068,8 @@ static void _handle_monster_move(monsters *monster)
}
_handle_behaviour(monster);
- // _handle_behaviour could make the monster leave the level.
+
+ // _handle_behaviour() could make the monster leave the level.
if (!monster->alive())
break;