diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-21 09:46:00 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-21 09:46:00 +0000 |
| commit | af6dde3945128ffddf3e9b61c9ae9b9ab9064bc0 (patch) | |
| tree | 376fe4493cf4ee40e9e08cf17df3bcb50331082f /crawl-ref/source/beam.cc | |
| parent | 1a33b2f941cbbf385eb9d578ce4e03bcd1d08e94 (diff) | |
| download | crawl-ref-af6dde3945128ffddf3e9b61c9ae9b9ab9064bc0.tar.gz crawl-ref-af6dde3945128ffddf3e9b61c9ae9b9ab9064bc0.zip | |
Fix explosions hitting their endpoint twice. [2481715]
As of now, explosion beams do not do affect anything until they actually
explode. I can't think of any explosions that should do this, but I'm pretty
sure there are some that I'm forgetting.
Fix a security issue with crash dump reporting.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8646 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/beam.cc')
| -rw-r--r-- | crawl-ref/source/beam.cc | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 346ba40798..5d91ed8880 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -181,7 +181,7 @@ static void _ench_animation( int flavour, const monsters *mon, bool force ) || flavour == BEAM_BLINK) ? EC_WARP : EC_ENCHANT; - zap_animation( element_colour( elem ), mon, force ); + zap_animation(element_colour(elem), mon, force); } // If needs_tracer is true, we need to check the beam path for friendly @@ -2907,6 +2907,11 @@ bool bolt::found_player() const void bolt::affect_ground() { + // Explosions only have an effect during their explosion phase. + // Special cases can be handled here. + if (is_explosion && !in_explosion_phase) + return; + if (is_tracer) return; @@ -3743,6 +3748,11 @@ void bolt::affect_player_enchantment() void bolt::affect_player() { + // Explosions only have an effect during their explosion phase. + // Special cases can be handled here. + if (is_explosion && !in_explosion_phase) + return; + // Digging -- don't care. if (flavour == BEAM_DIGGING) return; @@ -4326,6 +4336,11 @@ bool bolt::handle_statue_disintegration(monsters* mon) void bolt::affect_monster(monsters* mon) { + // Explosions only have an effect during their explosion phase. + // Special cases can be handled here. + if (is_explosion && !in_explosion_phase) + return; + // Don't hit dead monsters. if (!mon->alive()) { |