diff options
| author | Matthew Cline <zelgadis@sourceforge.net> | 2009-11-16 23:58:42 -0800 |
|---|---|---|
| committer | Matthew Cline <zelgadis@sourceforge.net> | 2009-11-17 00:01:17 -0800 |
| commit | eb530ce63328358ff3632c3e32760fdf49d0a92f (patch) | |
| tree | d9a5ec39184f95c1549c3183f9b3c937b64b3f8b /crawl-ref/source/mon-stuff.cc | |
| parent | 48624c055f2a8b98a71284ecb0522f94ebe3251c (diff) | |
| download | crawl-ref-eb530ce63328358ff3632c3e32760fdf49d0a92f.tar.gz crawl-ref-eb530ce63328358ff3632c3e32760fdf49d0a92f.zip | |
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.
Diffstat (limited to 'crawl-ref/source/mon-stuff.cc')
| -rw-r--r-- | crawl-ref/source/mon-stuff.cc | 3 |
1 files changed, 3 insertions, 0 deletions
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); |