--- deliantra/server/server/spell_attack.C	2008/09/29 10:20:49	1.65
+++ deliantra/server/server/spell_attack.C	2008/09/29 10:31:32	1.66
@@ -167,8 +167,7 @@
 
   if (--op->duration < 0)
     {
-      op->destroy_inv (true); // be explicit about dropping
-      op->destroy (true);
+      op->drop_and_destroy ();
       return;
     }
  
@@ -310,8 +309,7 @@
   mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y);
   if (mflags & P_OUT_OF_MAP)
     {
-      tmp->destroy_inv (true); // be explicit about dropping
-      tmp->destroy (true);
+      tmp->drop_and_destroy ();
       return 0;
     }
 
@@ -321,8 +319,7 @@
     {
       if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
         {
-          tmp->destroy_inv (true); // be explicit about dropping
-          tmp->destroy (true);
+          tmp->drop_and_destroy ();
           return 0;
         }
 
@@ -1188,8 +1185,7 @@
 {
   if (op->range-- <= 0)
     {
-      op->destroy_inv (true); // be explicit about dropping
-      op->destroy (true);
+      op->drop_and_destroy ();
       return;
     }
 
@@ -1749,8 +1745,7 @@
 
   if (!op->duration || !owner->is_on_map ())
     {
-      op->destroy_inv (true); // be explicit about dropping
-      op->destroy (true);
+      op->drop_and_destroy ();
       return;
     }