diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2010-01-07 23:09:38 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2010-01-07 23:09:38 +0100 |
| commit | ee183b121218deff2df20e68d69f8220a32b9d8c (patch) | |
| tree | be34670862a51293217ed0aa7ee7cf1ea528af8d /crawl-ref/source/player.cc | |
| parent | 443ff1cd181d260d562a35bffc60d61179ce1268 (diff) | |
| download | crawl-ref-ee183b121218deff2df20e68d69f8220a32b9d8c.tar.gz crawl-ref-ee183b121218deff2df20e68d69f8220a32b9d8c.zip | |
Make unknown potions of rage override clarity. Drugs > being focused > anger.
Diffstat (limited to 'crawl-ref/source/player.cc')
| -rw-r--r-- | crawl-ref/source/player.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index 52f577cc12..f5a0c2a852 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -5998,9 +5998,9 @@ void player::attacking(actor *other) } } -void player::go_berserk(bool intentional) +void player::go_berserk(bool intentional, bool potion) { - ::go_berserk(intentional); + ::go_berserk(intentional, potion); } bool player::can_go_berserk() const @@ -6008,9 +6008,9 @@ bool player::can_go_berserk() const return (can_go_berserk(false)); } -bool player::can_go_berserk(bool intentional) const +bool player::can_go_berserk(bool intentional, bool potion) const { - const bool verbose = intentional; + const bool verbose = intentional || potion; if (berserk()) { @@ -6046,7 +6046,7 @@ bool player::can_go_berserk(bool intentional) const return (false); } - if (!intentional && player_mental_clarity(true)) + if (!intentional && !potion && player_mental_clarity(true)) { if (verbose) { |