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/acr.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/acr.cc')
| -rw-r--r-- | crawl-ref/source/acr.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index cafcc35029..e31464f555 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -1223,7 +1223,7 @@ static void _go_upstairs() if (ygrd == DNGN_ENTER_SHOP) { - if (you.duration[DUR_BERSERKER]) + if (you.berserk()) canned_msg(MSG_TOO_BERSERK); else shop(); @@ -1280,7 +1280,7 @@ static void _go_downstairs() // Up and down both work for shops. if (ygrd == DNGN_ENTER_SHOP) { - if (you.duration[DUR_BERSERKER]) + if (you.berserk()) canned_msg(MSG_TOO_BERSERK); else shop(); @@ -3283,7 +3283,7 @@ static void _open_door(coord_def move, bool check_confused) } } - if (you.duration[DUR_BERSERKER]) + if (you.berserk()) { // XXX: Better flavour for larger doors? if (silenced(you.pos())) @@ -3443,7 +3443,7 @@ static void _close_door(coord_def move) int skill = you.dex + (you.skills[SK_TRAPS_DOORS] + you.skills[SK_STEALTH]) / 2; - if (you.duration[DUR_BERSERKER]) + if (you.berserk()) { if (silenced(you.pos())) { @@ -3773,7 +3773,7 @@ static void _do_berserk_no_combat_penalty(void) if (you.berserk_penalty == NO_BERSERK_PENALTY) return; - if (you.duration[DUR_BERSERKER]) + if (you.berserk()) { you.berserk_penalty++; |