diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2009-12-29 13:38:36 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2009-12-29 14:23:50 +0100 |
| commit | 3f8334b021c123a371f0dfe8062c3a84eebba673 (patch) | |
| tree | 7053abb388e3464328b75792d267513bc3c9ab0b /crawl-ref/source/player.cc | |
| parent | 8657d1a1b6f40b7da7e970ca6e0082d04f0d1802 (diff) | |
| download | crawl-ref-3f8334b021c123a371f0dfe8062c3a84eebba673.tar.gz crawl-ref-3f8334b021c123a371f0dfe8062c3a84eebba673.zip | |
Make clarity allow intentional berserk.
Unknown potions of rage override it as well. This is a debatable thing,
but since other sources of involuntary berserk are caused by "being angry",
it makes sense a drug is not affected by merely being calm.
Diffstat (limited to 'crawl-ref/source/player.cc')
| -rw-r--r-- | crawl-ref/source/player.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index 7ba87a20ff..631e04e622 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -5980,8 +5980,10 @@ bool player::can_go_berserk() const return (can_go_berserk(false)); } -bool player::can_go_berserk(bool verbose, bool no_clarity) const +bool player::can_go_berserk(bool intentional) const { + const bool verbose = intentional; + if (berserk()) { if (verbose) @@ -6016,7 +6018,7 @@ bool player::can_go_berserk(bool verbose, bool no_clarity) const return (false); } - if (!no_clarity && player_mental_clarity(true)) + if (!intentional && player_mental_clarity(true)) { if (verbose) { |