From f858cfc60235a5cfb86dd2a2c510dde5e130a4bf Mon Sep 17 00:00:00 2001
From: David Lawrence Ramsey <dolorous@users.sourceforge.net>
Date: Fri, 6 Nov 2009 13:37:03 -0600
Subject: Move checks for the berserk state into actor::berserk().

---
 crawl-ref/source/beam.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'crawl-ref/source/beam.cc')

diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index 41736c6b16..7d20454b35 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -5214,7 +5214,8 @@ mon_resist_type bolt::apply_enchantment_to_monster(monsters* mon)
         return (MON_AFFECTED);
 
     case BEAM_BERSERK:
-        if (!mon->has_ench(ENCH_BERSERK)) {
+        if (!mon->berserk())
+        {
             // currently from potion, hence voluntary
             mon->go_berserk(true);
             // can't return this from go_berserk, unfortunately
-- 
cgit v1.2.3-54-g00ecf