Give move/copy_item_to_grid responsibility for hazardous terrain

We now have much less duplication of logic, yay.

1 files changed, 12 insertions, 17 deletions

diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc
index 4bac2e7ff0..b9d9fdabb3 100644
--- a/crawl-ref/source/misc.cc
+++ b/crawl-ref/source/misc.cc
@@ -1041,23 +1041,18 @@ void split_potions_into_decay( int obj, int amount, bool need_msg )
         }
     }
 
-    // Only bother creating a distinct stack of potions
-    // if it won't get destroyed right away.
-    if (!feat_destroys_items(grd(you.pos())))
-    {
-        item_def potion2;
-        potion2.base_type = OBJ_POTIONS;
-        potion2.sub_type  = POT_DECAY;
-        // Keep description as it was.
-        potion2.plus      = potion.plus;
-        potion2.quantity  = amount;
-        potion2.colour    = potion.colour;
-        potion2.plus2     = 0;
-        potion2.flags     = 0;
-        potion2.special   = 0;
-
-        copy_item_to_grid(potion2, you.pos());
-    }
+    item_def potion2;
+    potion2.base_type = OBJ_POTIONS;
+    potion2.sub_type  = POT_DECAY;
+    // Keep description as it was.
+    potion2.plus      = potion.plus;
+    potion2.quantity  = amount;
+    potion2.colour    = potion.colour;
+    potion2.plus2     = 0;
+    potion2.flags     = 0;
+    potion2.special   = 0;
+
+    copy_item_to_grid(potion2, you.pos());
 
     // Is decreased even if the decay stack goes splat.
     dec_inv_item_quantity(obj, amount);