From 61ebfeda71005384365b4598594e03bbdaec1e05 Mon Sep 17 00:00:00 2001
From: zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>
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/beam.cc | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'crawl-ref/source/beam.cc')

diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index 20e762e6b9..7dc06695e4 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -3071,6 +3071,18 @@ void beam_drop_object( bolt &beam, item_def *item, int x, int y )
     if (beam.is_tracer || beam.flavour != BEAM_MISSILE)
         return;
 
+    if (item->flags & ISFLAG_SUMMONED)
+    {
+        if (see_grid(x, y))
+        {
+            mprf("%s disappears in a puff of smoke!",
+                 item->name(DESC_CAP_THE).c_str());
+        }
+        item_was_destroyed(*item, beam.beam_source);
+
+        return;
+    }
+
     if (YOU_KILL(beam.thrower)
             && !thrown_object_destroyed(item, x, y, false)
         || MON_KILL(beam.thrower)
-- 
cgit v1.2.3-54-g00ecf