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/fight.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/fight.cc')
| -rw-r--r-- | crawl-ref/source/fight.cc | 3 |
1 files changed, 1 insertions, 2 deletions
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); |