summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/monstuff.cc
diff options
context:
space:
mode:
authorzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-05 07:42:35 +0000
committerzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-05 07:42:35 +0000
commitb04080e0ccd31645fd23316c16734809bebdf28e (patch)
tree7f1ace08558f8d387db3ad05df5a8219f24dba9b /crawl-ref/source/monstuff.cc
parent464c6c2079869fd86514eaa3942f9d4eb565f763 (diff)
downloadcrawl-ref-b04080e0ccd31645fd23316c16734809bebdf28e.tar.gz
crawl-ref-b04080e0ccd31645fd23316c16734809bebdf28e.zip
In monster_die(), place cloud of smoke after the monster has its chance to give
a death speech. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8238 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/monstuff.cc')
-rw-r--r--crawl-ref/source/monstuff.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc
index 23b76f2f04..0aba21ff15 100644
--- a/crawl-ref/source/monstuff.cc
+++ b/crawl-ref/source/monstuff.cc
@@ -1537,8 +1537,6 @@ void monster_die(monsters *monster, killer_type killer,
// This must only be called by monsters running out of time (or
// abjuration), because it uses the beam variables! Or does it???
if (!wizard)
- _monster_die_cloud(monster, false, silent, summoned,
- summon_type);
// KILL_RESET monsters no longer lose their whole inventory, only
// items they were generated with.
@@ -1606,9 +1604,10 @@ void monster_die(monsters *monster, killer_type killer,
}
}
+ _monster_die_cloud(monster, !mons_reset, silent, summoned, summon_type);
+
if (!mons_reset)
{
- _monster_die_cloud(monster, true, silent, summoned, summon_type);
// Have to add case for disintegration effect here? {dlb}
if (!summoned)
_place_monster_corpse(monster, silent);