summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-30 07:26:15 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-30 07:26:15 +0000
commit5a57ec42266234f2692d18b13a7b237bb2843645 (patch)
treef368b1f22ae8ce8c4c8dcf5b67374a7548e338da
parentf6521dd51a41accc9dd35185e5cf0b7c5b6bb9f6 (diff)
downloadcrawl-ref-5a57ec42266234f2692d18b13a7b237bb2843645.tar.gz
crawl-ref-5a57ec42266234f2692d18b13a7b237bb2843645.zip
Trunk->0.4 r6729: Fix evaporate trailing clouds before explosion (sorear).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6730 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/beam.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index 5c1f024c4e..0bed353d97 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -1760,6 +1760,11 @@ void fire_beam(bolt &pbolt, item_def *item, bool drop_item)
bool did_bounce = false;
cursor_control coff(false);
+ // [ds] Forcing the beam out of explosion phase here - currently
+ // no caller relies on the beam already being in_explosion_phase.
+ // This fixes beams being in explosion after use as a tracer.
+ pbolt.in_explosion_phase = false;
+
beam_message_cache.clear();
#ifdef USE_TILE