diff options
| author | Robert Vollmert <rvollmert@gmx.net> | 2009-11-13 17:48:11 +0100 |
|---|---|---|
| committer | Robert Vollmert <rvollmert@gmx.net> | 2009-11-13 17:48:38 +0100 |
| commit | d47e840aba5d25f699213875956fb4644e0d5a77 (patch) | |
| tree | 72d0eea4867ea31c16f034f0415dc940576b627d /crawl-ref/source/beam.cc | |
| parent | faaed30006234c92769cf0cd2900b94b86133847 (diff) | |
| download | crawl-ref-d47e840aba5d25f699213875956fb4644e0d5a77.tar.gz crawl-ref-d47e840aba5d25f699213875956fb4644e0d5a77.zip | |
Fix bushes not being affected by explosions.
This also fixes Cerebov not fire-storming bushes in the arena.
Diffstat (limited to 'crawl-ref/source/beam.cc')
| -rw-r--r-- | crawl-ref/source/beam.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 6cadc87f16..065db7c014 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -4739,7 +4739,8 @@ void bolt::affect_monster(monsters* mon) } // Missiles go past bushes. - if (!is_beam && mon->type == MONS_BUSH) + if (mon->type == MONS_BUSH && !is_beam && !is_explosion && + (flavour == BEAM_MISSILE || flavour == BEAM_MMISSILE)) { apply_hit_funcs(mon, 0); return; |