diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2009-11-05 00:42:52 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2009-11-05 00:42:52 +0100 |
| commit | f3df7a055478e0bff996cf3d74c52365e188d734 (patch) | |
| tree | 0cc052bdeb8e8ebd60d9583baf7e6e708f4a4a7b /crawl-ref/source/makeitem.cc | |
| parent | c6d136cb11c6f33e437a6cd838509afad1effbbc (diff) | |
| download | crawl-ref-f3df7a055478e0bff996cf3d74c52365e188d734.tar.gz crawl-ref-f3df7a055478e0bff996cf3d74c52365e188d734.zip | |
Fix an assert crash when a monster picks up missiles that merge into his stack.
Diffstat (limited to 'crawl-ref/source/makeitem.cc')
| -rw-r--r-- | crawl-ref/source/makeitem.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc index 5658739397..6d4dad9682 100644 --- a/crawl-ref/source/makeitem.cc +++ b/crawl-ref/source/makeitem.cc @@ -3293,7 +3293,8 @@ static void _give_monster_item(monsters *mon, int thing, destroy_item(thing, true); return; } - ASSERT(is_valid_item(mthing)); + if (!is_valid_item(mthing)) // missiles merged into an existing stack + return; ASSERT(mthing.holding_monster() == mon); if (!force_item || mthing.colour == BLACK) |