diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-06-15 17:23:00 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-06-15 17:23:00 +0000 |
| commit | 3893b36195d2345f1a24a42fd5ed31cd72a8f501 (patch) | |
| tree | 58d304bfc843f52e670c4e1aa96fe8b12464d046 /crawl-ref | |
| parent | 148d336e808fb9552692b46f750e8aaa35c92210 (diff) | |
| download | crawl-ref-3893b36195d2345f1a24a42fd5ed31cd72a8f501.tar.gz crawl-ref-3893b36195d2345f1a24a42fd5ed31cd72a8f501.zip | |
[1635047] Beams should not affect monsters that are dead.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1590 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/beam.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 0b214cf884..e5a11f1f2f 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -2476,9 +2476,10 @@ int affect(bolt &beam, int x, int y) // Monsters submerged in shallow water can be targeted by beams // aimed at that spot. - if (!mons->submerged() - || (beam.aimed_at_spot && beam.target() == mons->pos() - && grd(mons->pos()) == DNGN_SHALLOW_WATER)) + if (mons->alive() + && (!mons->submerged() + || (beam.aimed_at_spot && beam.target() == mons->pos() + && grd(mons->pos()) == DNGN_SHALLOW_WATER))) { if (!beam.is_big_cloud && (!beam.is_explosion || beam.in_explosion_phase)) |