diff options
| author | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-05 14:53:04 +0000 |
|---|---|---|
| committer | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-05 14:53:04 +0000 |
| commit | 87c95a753d11b0b540f7c6a3d3e7f8a8b67ae3c1 (patch) | |
| tree | f6c89860622bf0c2fb6e569e0addcd7636c61c57 /crawl-ref/source/item_use.cc | |
| parent | 086e548103eed62bf4d1bb806e2bec88562fbfe6 (diff) | |
| download | crawl-ref-87c95a753d11b0b540f7c6a3d3e7f8a8b67ae3c1.tar.gz crawl-ref-87c95a753d11b0b540f7c6a3d3e7f8a8b67ae3c1.zip | |
[2010192] Fixing issue where cancelling a ranged attack (e.g. "Really fire on...?") wouldn't really cancel the attack. Also, s/beam_stopped/beam_cancelled/ for clarity.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6409 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/item_use.cc')
| -rw-r--r-- | crawl-ref/source/item_use.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 06c688deb7..49855a0b41 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -1912,7 +1912,7 @@ bool throw_it(bolt &pbolt, int throw_2, bool teleport, int acc_bonus, // Should only happen if the player answered 'n' to one of those // "Fire through friendly?" prompts. - if (pbolt.fr_count > 0) + if (pbolt.fr_count > 0 || pbolt.beam_cancelled) { canned_msg(MSG_OK); you.turn_is_over = false; |