diff options
| author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-06 13:37:03 -0600 |
|---|---|---|
| committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-06 13:37:52 -0600 |
| commit | f858cfc60235a5cfb86dd2a2c510dde5e130a4bf (patch) | |
| tree | d961eaf5b7122e52a9250e3381d93b1e9c80c88b /crawl-ref/source/beam.cc | |
| parent | 79d8c3044d2bb75d7f1e8ebad5cf6e3692fb7605 (diff) | |
| download | crawl-ref-f858cfc60235a5cfb86dd2a2c510dde5e130a4bf.tar.gz crawl-ref-f858cfc60235a5cfb86dd2a2c510dde5e130a4bf.zip | |
Move checks for the berserk state into actor::berserk().
Diffstat (limited to 'crawl-ref/source/beam.cc')
| -rw-r--r-- | crawl-ref/source/beam.cc | 3 |
1 files changed, 2 insertions, 1 deletions
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 |