diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-31 15:20:58 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-31 15:20:58 +0000 |
| commit | cbceff8b6a6ec323331c01f10fe098db9a002111 (patch) | |
| tree | 0ad7ca07c76abd6107be129ce079a509890f9caa /crawl-ref/source/monstuff.cc | |
| parent | 907ba5ab4576a160689ffe3575e8ecf8b2f66a79 (diff) | |
| download | crawl-ref-cbceff8b6a6ec323331c01f10fe098db9a002111.tar.gz crawl-ref-cbceff8b6a6ec323331c01f10fe098db9a002111.zip | |
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
Diffstat (limited to 'crawl-ref/source/monstuff.cc')
| -rw-r--r-- | crawl-ref/source/monstuff.cc | 5 |
1 files changed, 4 insertions, 1 deletions
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 " |