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/fight.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'crawl-ref/source/fight.cc') diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index 6f44616de8..29715af093 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -4099,8 +4099,7 @@ bool melee_attack::mons_attack_mons() mpr("Zin prevents your ally from violating sanctuary " "in its confusion.", MSGCH_GOD); } - else if (attacker_as_monster()->has_ench(ENCH_BERSERK) - && you.can_see(attacker)) + else if (attacker->berserk() && you.can_see(attacker)) { mpr("Zin prevents your ally from violating sanctuary " "in its berserker rage.", MSGCH_GOD); -- cgit v1.2.3-54-g00ecf