From 1f328a8c326b0a2ff99dbf776b17b7375cb8061b Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Wed, 16 Apr 2008 14:04:41 +0000 Subject: Fix compile, a few minor changes (mostly commenting), and fix 1856365: wandering mushrooms "turns to fight". git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4256 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/monstuff.cc | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'crawl-ref/source/monstuff.cc') diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index 66e634673e..15c51418c6 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -2048,10 +2048,14 @@ void behaviour_event( monsters *mon, int event, int src, break; case ME_SCARE: - // Berserking monsters don't flee + // Berserking monsters don't flee. if (mon->has_ench(ENCH_BERSERK)) break; + // Neither do wandering mushrooms. + if (mon->type == MONS_WANDERING_MUSHROOM) + break; + mon->foe = src; mon->behaviour = BEH_FLEE; // assume monsters know where to run from, even @@ -2062,6 +2066,9 @@ void behaviour_event( monsters *mon, int event, int src, break; case ME_CORNERED: + if (mon->type == MONS_WANDERING_MUSHROOM) + break; + // just set behaviour.. foe doesn't change. if (mon->behaviour != BEH_CORNERED && !mon->has_ench(ENCH_FEAR)) simple_monster_message(mon, " turns to fight!"); @@ -6241,7 +6248,7 @@ forget_it: } if (monster->type == MONS_ROTTING_DEVIL - || monster->type == MONS_CURSE_TOE) + || monster->type == MONS_CURSE_TOE) { place_cloud( CLOUD_MIASMA, monster->x, monster->y, 2 + random2(3), monster->kill_alignment() ); -- cgit v1.2.3-54-g00ecf