From f858cfc60235a5cfb86dd2a2c510dde5e130a4bf Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Fri, 6 Nov 2009 13:37:03 -0600 Subject: Move checks for the berserk state into actor::berserk(). --- crawl-ref/source/mon-abil.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'crawl-ref/source/mon-abil.cc') diff --git a/crawl-ref/source/mon-abil.cc b/crawl-ref/source/mon-abil.cc index 0cd0b4e801..0c62f719e0 100644 --- a/crawl-ref/source/mon-abil.cc +++ b/crawl-ref/source/mon-abil.cc @@ -598,7 +598,7 @@ static bool _orc_battle_cry(monsters *chief) && mons_species(mon->type) == MONS_ORC && mons_aligned(boss_index, i) && mon->hit_dice < chief->hit_dice - && !mon->has_ench(ENCH_BERSERK) + && !mon->berserk() && !mon->has_ench(ENCH_MIGHT) && !mon->cannot_move() && !mon->confused() @@ -1188,7 +1188,7 @@ bool mon_special_ability(monsters *monster, bolt & beem) } // Don't even try on berserkers. Mermaids know their limits. - if (you.duration[DUR_BERSERKER]) + if (you.berserk()) break; // Reduce probability because of spamminess. -- cgit v1.2.3-54-g00ecf