From 2bbd33ecce444f4a14e817355c67d5d86d505c16 Mon Sep 17 00:00:00 2001 From: Stefan O'Rear Date: Wed, 30 Dec 2009 02:02:37 -0800 Subject: Killing a merfolk should not cause it to leap 10 feet into the air and drop its gear from a height. --- crawl-ref/source/mon-stuff.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'crawl-ref/source/mon-stuff.cc') diff --git a/crawl-ref/source/mon-stuff.cc b/crawl-ref/source/mon-stuff.cc index bcaeecc95a..cb14b67710 100644 --- a/crawl-ref/source/mon-stuff.cc +++ b/crawl-ref/source/mon-stuff.cc @@ -277,7 +277,8 @@ void monster_drop_ething(monsters *monster, bool mark_item_origins, if (mark_item_origins && mitm[item].is_valid()) origin_set_monster(mitm[item], monster); - move_item_to_grid(&item, monster->pos()); + // If a monster is swimming, the items are ALREADY underwater + move_item_to_grid(&item, monster->pos(), monster->swimming()); } monster->inv[i] = NON_ITEM; @@ -466,7 +467,7 @@ int place_monster_corpse(const monsters *monster, bool silent, return (-1); } - move_item_to_grid(&o, monster->pos()); + move_item_to_grid(&o, monster->pos(), !monster->swimming()); if (you.see_cell(monster->pos())) { -- cgit v1.2.3-54-g00ecf