Merge pull request #48712 from Zeropol/shatter_item_dont_destroy

Remove items that shatter instead of dropping them intact
CleverRaven · May 4, 2021 · 67105a9 · 67105a9
2 parents 935b5c8 + 8c2deb4
commit 67105a9
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/ballistics.cpp b/src/ballistics.cpp
@@ -53,10 +53,9 @@ static void drop_or_embed_projectile( const dealt_projectile_attack &attack )
     if( effects.count( "SHATTER_SELF" ) ) {
         // Drop the contents, not the thrown item
         add_msg_if_player_sees( pt, _( "The %s shatters!" ), drop_item.tname() );
-        drop_item.visit_items( [&pt]( const item * it, item * ) {
-            get_map().add_item_or_charges( pt, *it );
-            return VisitResponse::NEXT;
-        } );
+
+        // copies the drop item to spill the contents
+        item( drop_item ).spill_contents( pt );
 
         // TODO: Non-glass breaking
         // TODO: Wine glass breaking vs. entire sheet of glass breaking