From 61ebfeda71005384365b4598594e03bbdaec1e05 Mon Sep 17 00:00:00 2001 From: zelgadis Date: Tue, 16 Dec 2008 03:58:13 +0000 Subject: Merge r7836: divine summons should drop non-summoned items on death (FR #2424917), summoned items should vanish when dropped/fired/thrown by monsters. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@7844 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/mstuff2.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'crawl-ref/source/mstuff2.cc') diff --git a/crawl-ref/source/mstuff2.cc b/crawl-ref/source/mstuff2.cc index dbf42916b3..804f141895 100644 --- a/crawl-ref/source/mstuff2.cc +++ b/crawl-ref/source/mstuff2.cc @@ -1582,7 +1582,8 @@ bool mons_thrown_object_destroyed( item_def *item, int x, int y, if (returning && !destroyed) hostile_grid = false; - if (hostile_grid) + // Summoned items go poof if they're not returning. + if (hostile_grid || !returning && (item->flags & ISFLAG_SUMMONED)) { // No destruction sound here. Too much message spam otherwise. item_was_destroyed(*item, midx); -- cgit v1.2.3-54-g00ecf