Get the arena tied-round and giant spore logic working again, partially by

making self-initiated explosions happen directly in
melee_attack::mons_self_destructs() and by calling arena_monster_died() after
the spore has exploded instead of before.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8268 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 3 insertions, 3 deletions

diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc
index 38389666f9..48121c8ec9 100644
--- a/crawl-ref/source/monstuff.cc
+++ b/crawl-ref/source/monstuff.cc
@@ -1004,9 +1004,6 @@ void monster_die(monsters *monster, killer_type killer,
     if (!silent && _monster_avoided_death(monster, killer, killer_index))
         return;
 
-    if (crawl_state.arena)
-        arena_monster_died(monster, killer, killer_index, silent);
-
     mons_clear_trapping_net(monster);
 
     // Update list of monsters beholding player.
@@ -1156,6 +1153,9 @@ void monster_die(monsters *monster, killer_type killer,
         }
     }
 
+    if (crawl_state.arena)
+        arena_monster_died(monster, killer, killer_index, silent);
+
     bool death_message = !silent && !did_death_message && mons_near(monster)
                          && (player_monster_visible(monster)
                              || crawl_state.arena);