From eb530ce63328358ff3632c3e32760fdf49d0a92f Mon Sep 17 00:00:00 2001 From: Matthew Cline Date: Mon, 16 Nov 2009 23:58:42 -0800 Subject: Fix delayed monster explosions If a monster "dies" from disintegration/nuke, but then is saved by divine intervention, it shouldn't still explode when it dies later. --- crawl-ref/source/mon-stuff.cc | 3 +++ 1 file changed, 3 insertions(+) (limited to 'crawl-ref/source/mon-stuff.cc') diff --git a/crawl-ref/source/mon-stuff.cc b/crawl-ref/source/mon-stuff.cc index f8b4962823..150f58ec55 100644 --- a/crawl-ref/source/mon-stuff.cc +++ b/crawl-ref/source/mon-stuff.cc @@ -1387,7 +1387,10 @@ int monster_die(monsters *monster, killer_type killer, monster->flags &= ~MF_BANISHED; if (!silent && _monster_avoided_death(monster, killer, killer_index)) + { + monster->flags &= ~MF_EXPLODE_KILL; return (-1); + } crawl_state.inc_mon_acting(monster); -- cgit v1.2.3-54-g00ecf