diff options
| author | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-12-16 03:58:13 +0000 |
|---|---|---|
| committer | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-12-16 03:58:13 +0000 |
| commit | 61ebfeda71005384365b4598594e03bbdaec1e05 (patch) | |
| tree | f0d0a77eb97de4fa73a8a8de22192f694421bb38 /crawl-ref/source/beam.cc | |
| parent | 545b45725085f4c2c09c2cf8275466b80645cb98 (diff) | |
| download | crawl-ref-61ebfeda71005384365b4598594e03bbdaec1e05.tar.gz crawl-ref-61ebfeda71005384365b4598594e03bbdaec1e05.zip | |
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
Diffstat (limited to 'crawl-ref/source/beam.cc')
| -rw-r--r-- | crawl-ref/source/beam.cc | 12 |
1 files changed, 12 insertions, 0 deletions
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) |