From c9a8094eec1acb94149980937c60d8c05f8d901b Mon Sep 17 00:00:00 2001 From: haranp Date: Wed, 27 Jun 2007 22:26:04 +0000 Subject: Monster arrows no longer get dropped on destroyer grids (1744345.) Fixed a crash when monsters 'splash around'. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1673 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/beam.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'crawl-ref/source/beam.cc') diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 3bd13ae45d..cd972897b5 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -2369,15 +2369,15 @@ void beam_drop_object( bolt &beam, item_def *item, int x, int y ) if (beam.is_tracer || beam.flavour != BEAM_MISSILE) return; - // maybe we can remove the YOU_KILL... - if ( grid_destroys_items(grd[x][y]) && YOU_KILL(beam.thrower) ) + if ( grid_destroys_items(grd[x][y]) ) { - mprf(MSGCH_SOUND, grid_item_destruction_message(grd[x][y])); + // Too much message spam otherwise + if ( YOU_KILL(beam.thrower) ) + mprf(MSGCH_SOUND, grid_item_destruction_message(grd[x][y])); return; } - if (YOU_KILL(beam.thrower) // ie if you threw it. - && (!grid_destroys_items(grd[x][y]))) + if (YOU_KILL(beam.thrower)) // you threw it { int chance; -- cgit v1.2.3-54-g00ecf