diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-18 22:20:18 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-18 22:20:18 +0000 |
| commit | 333ecf9fdad3478a6ae7527837aea46c3a6cec11 (patch) | |
| tree | 08baf5187b05212e34095f0b77a2149a3e72c3e0 /crawl-ref/source/beam.cc | |
| parent | 9848185528abe4c0afe9a92f4ea99f61e0e276b8 (diff) | |
| download | crawl-ref-333ecf9fdad3478a6ae7527837aea46c3a6cec11.tar.gz crawl-ref-333ecf9fdad3478a6ae7527837aea46c3a6cec11.zip | |
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
Diffstat (limited to 'crawl-ref/source/beam.cc')
| -rw-r--r-- | crawl-ref/source/beam.cc | 9 |
1 files changed, 8 insertions, 1 deletions
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; |