diff options
| author | Steve Melenchuk <smelenchuk@gmail.com> | 2014-05-08 10:29:58 -0600 |
|---|---|---|
| committer | Steve Melenchuk <smelenchuk@gmail.com> | 2014-05-08 10:29:58 -0600 |
| commit | f86312ef14885f9b52d6afd18d8b317f1d8047a3 (patch) | |
| tree | fdce90398d4cee2d1c826b43572ee3c57743146c /crawl-ref/source/player-act.cc | |
| parent | 5fed7dde5ee02f117f6e2368777f0f9c650c2ed1 (diff) | |
| download | crawl-ref-f86312ef14885f9b52d6afd18d8b317f1d8047a3.tar.gz crawl-ref-f86312ef14885f9b52d6afd18d8b317f1d8047a3.zip | |
Don't trigger berserkitis on ranged attacks (#8516).
Oops.
Diffstat (limited to 'crawl-ref/source/player-act.cc')
| -rw-r--r-- | crawl-ref/source/player-act.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/player-act.cc b/crawl-ref/source/player-act.cc index c0410ecfbc..384c350cc1 100644 --- a/crawl-ref/source/player-act.cc +++ b/crawl-ref/source/player-act.cc @@ -700,7 +700,7 @@ bool player::cannot_fight() const return false; } -void player::attacking(actor *other) +void player::attacking(actor *other, bool ranged) { ASSERT(!crawl_state.game_is_arena()); @@ -714,7 +714,7 @@ void player::attacking(actor *other) pet_target = mon->mindex(); } - if (mons_is_firewood((monster*) other)) + if (ranged || mons_is_firewood((monster*) other)) return; const int chance = pow(3, player_mutation_level(MUT_BERSERK) - 1); |