diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-12-09 06:16:29 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-12-09 06:16:29 +0000 |
| commit | 9da27c1648c90a307ad2a1e291608991b76953ad (patch) | |
| tree | 89349bc165cc675ff3199a57fc9f1225da49280e /crawl-ref/source/beam.cc | |
| parent | 495876a95217ab195379dd9506f5d8935d88fc6f (diff) | |
| download | crawl-ref-9da27c1648c90a307ad2a1e291608991b76953ad.tar.gz crawl-ref-9da27c1648c90a307ad2a1e291608991b76953ad.zip | |
Fix [2383845]: Monsters that avoid death from a beam should not be
annoyed by the damage from that beam.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7797 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/beam.cc')
| -rw-r--r-- | crawl-ref/source/beam.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index c6b136def4..1f03b7930a 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -4806,7 +4806,7 @@ static int _affect_monster(bolt &beam, monsters *mon, item_def *item) } // Now hurt monster. - mon->hurt(beam.agent(), hurt_final, beam.flavour); + mon->hurt(beam.agent(), hurt_final, beam.flavour, false); if (mon->alive()) { @@ -4878,6 +4878,8 @@ static int _affect_monster(bolt &beam, monsters *mon, item_def *item) else if (hit_woke_orc) beogh_follower_convert(mon, true); } + else + monster_die(mon, beam.thrower, _beam_source(beam)); return (_range_used_on_hit(beam)); } |