summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2009-06-05 22:51:35 +0000
committerzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2009-06-05 22:51:35 +0000
commitbadfa07bf589777a06a19e37568700e9f3c259e1 (patch)
tree89102c795d47b08b9d8cfae42cdacd3e31eb4626
parentfd26c0e69083dd7e72935c62a897ad857b020c63 (diff)
downloadcrawl-ref-badfa07bf589777a06a19e37568700e9f3c259e1.tar.gz
crawl-ref-badfa07bf589777a06a19e37568700e9f3c259e1.zip
Merge r9898 from trunk: fix bug 2800889.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.5@9899 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/beam.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index 5133bb0c9e..c81103c3fc 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -1793,7 +1793,7 @@ void bolt::hit_wall()
ASSERT( grid_is_solid(feat) );
if (is_tracer && YOU_KILL(thrower) && in_bounds(target)
- && pos() != target && pos() != source
+ && pos() != target && pos() != source && foe_info.count == 0
&& flavour != BEAM_DIGGING && flavour <= BEAM_LAST_REAL
&& !affects_nothing && bounces == 0 && reflections == 0
&& see_grid(target) && !grid_is_solid(grd(target)))