From d752c86b835ebb44452f869e772b3071371d800a Mon Sep 17 00:00:00 2001 From: haranp Date: Wed, 31 Dec 2008 22:55:24 +0000 Subject: Fix Evaporate not being an explosion and going through walls (range was uninitialized.) git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8065 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/beam.cc | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'crawl-ref/source/beam.cc') diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 2fb6c3764e..af64208352 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -2817,17 +2817,6 @@ void bolt::affect_endpoint() return; } - if (flavour >= BEAM_POTION_STINKING_CLOUD && flavour <= BEAM_POTION_RANDOM) - { - int newcolour = _potion_beam_flavour_to_colour(flavour); - if (newcolour >= 0) - colour = newcolour; - - ex_size = std::max(1, ex_size); - explode(); - return; - } - if (is_tracer) return; @@ -5076,7 +5065,15 @@ void bolt::refine_for_explosion() seeMsg = "The potion explodes!"; hearMsg = "You hear an explosion!"; if (!is_tracer) + { + name = "cloud"; + ASSERT(flavour >= BEAM_POTION_STINKING_CLOUD + && flavour <= BEAM_POTION_RANDOM); + const int newcolour = _potion_beam_flavour_to_colour(flavour); + if (newcolour >= 0) + colour = newcolour; + } } if (seeMsg == NULL) -- cgit v1.2.3-54-g00ecf