From 333ecf9fdad3478a6ae7527837aea46c3a6cec11 Mon Sep 17 00:00:00 2001 From: haranp Date: Sun, 18 Jan 2009 22:20:18 +0000 Subject: Fix 2511848: manual explosions having their flavour overriden. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8559 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/beam.cc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'crawl-ref/source/beam.cc') diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 2620a8fb6f..70a8e69d26 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -5153,7 +5153,14 @@ bool bolt::explode(bool show_more, bool hole_in_the_middle) ASSERT(!in_explosion_phase); ASSERT(ex_size > 0); - flavour = real_flavour; + // explode() can be called manually without setting real_flavour. + // FIXME: The entire flavour/real_flavour thing needs some + // rewriting! + if (real_flavour == BEAM_CHAOS || real_flavour == BEAM_RANDOM) + flavour = real_flavour; + else + real_flavour = flavour; + const int r = std::min(ex_size, MAX_EXPLOSION_RADIUS); in_explosion_phase = true; -- cgit v1.2.3-54-g00ecf