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/delay.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/delay.cc')
| -rw-r--r-- | crawl-ref/source/delay.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc index 8297f964b8..b7b47f195a 100644 --- a/crawl-ref/source/delay.cc +++ b/crawl-ref/source/delay.cc @@ -562,8 +562,7 @@ void handle_interrupted_swap(bool swap_if_safe, bool force_unsafe, bool transform) { if (!you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED] - || !you_tran_can_wear(EQ_WEAPON) || you.cannot_act() - || you.duration[DUR_BERSERKER]) + || !you_tran_can_wear(EQ_WEAPON) || you.cannot_act() || you.berserk()) { return; } @@ -1284,7 +1283,7 @@ static void _finish_delay(const delay_queue_item &delay) else turn_corpse_into_chunks(item); - if (you.duration[DUR_BERSERKER] + if (you.berserk() && you.berserk_penalty != NO_BERSERK_PENALTY) { mpr("You enjoyed that."); |