diff options
| author | Stefan O'Rear <stefanor@cox.net> | 2009-12-30 02:02:37 -0800 |
|---|---|---|
| committer | Stefan O'Rear <stefanor@cox.net> | 2009-12-30 02:02:37 -0800 |
| commit | 2bbd33ecce444f4a14e817355c67d5d86d505c16 (patch) | |
| tree | a5476436c6651afb836bdebf607a0a280a11404b /crawl-ref/source/mon-stuff.cc | |
| parent | 5b697e0c33dbab41e41c63df1ef2b366fbf0a8d9 (diff) | |
| download | crawl-ref-2bbd33ecce444f4a14e817355c67d5d86d505c16.tar.gz crawl-ref-2bbd33ecce444f4a14e817355c67d5d86d505c16.zip | |
Killing a merfolk should not cause it to leap 10 feet into the air and drop its gear from a height.
Diffstat (limited to 'crawl-ref/source/mon-stuff.cc')
| -rw-r--r-- | crawl-ref/source/mon-stuff.cc | 5 |
1 files changed, 3 insertions, 2 deletions
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())) { |