From 9da27c1648c90a307ad2a1e291608991b76953ad Mon Sep 17 00:00:00 2001 From: dolorous Date: Tue, 9 Dec 2008 06:16:29 +0000 Subject: 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 --- crawl-ref/source/beam.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'crawl-ref/source/beam.cc') 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)); } -- cgit v1.2.3-54-g00ecf