summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/monstuff.cc
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/monstuff.cc')
-rw-r--r--crawl-ref/source/monstuff.cc18
1 files changed, 9 insertions, 9 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc
index a6225e6e0c..d6778f486a 100644
--- a/crawl-ref/source/monstuff.cc
+++ b/crawl-ref/source/monstuff.cc
@@ -822,19 +822,19 @@ void monster_die(monsters *monster, killer_type killer, int i, bool silent)
{
if (!silent)
{
- if (hard_reset)
- simple_monster_message( monster,
- " disappears in a puff of smoke!" );
- else
+ if (!hard_reset)
+ {
simple_monster_message(monster, " falls from the air.",
MSGCH_MONSTER_DAMAGE, MDAM_DEAD);
- death_message = false;
+ death_message = false;
+ }
}
- if (hard_reset)
- place_cloud( random_smoke_type(),
- monster->x, monster->y, 1 + random2(3),
- monster->kill_alignment() );
+ if (!hard_reset)
+ {
+ if (killer == KILL_RESET)
+ killer = KILL_DISMISSED;
+ }
}
switch (killer)