From cbceff8b6a6ec323331c01f10fe098db9a002111 Mon Sep 17 00:00:00 2001 From: haranp Date: Sat, 31 Jan 2009 15:20:58 +0000 Subject: Fix [2549941]: don't give the shapeshifter death message unless it's an actual death (as opposed to KILL_DISMISS or KILL_RESET, e.g. when a monster climbs stairs or is banished.) git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8862 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/monstuff.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'crawl-ref/source/monstuff.cc') diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index 75a2de43fd..40417e29c1 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -1695,11 +1695,14 @@ int monster_die(monsters *monster, killer_type killer, if (drop_items) monster_drop_ething(monster, YOU_KILL(killer) || pet_kill); else + { // Destroy the items belonging to MF_HARD_RESET monsters so they // don't clutter up mitm[] monster->destroy_inventory(); + } - if (!silent && !wizard && !(monster->flags & MF_KNOWN_MIMIC) + if (!silent && !wizard && !mons_reset + && !(monster->flags & MF_KNOWN_MIMIC) && mons_is_shapeshifter(monster)) { simple_monster_message(monster, "'s shape twists and changes " -- cgit v1.2.3-54-g00ecf