--- deliantra/server/server/spell_attack.C	2006/09/16 22:24:13	1.15
+++ deliantra/server/server/spell_attack.C	2006/12/12 20:53:03	1.16
@@ -176,8 +176,8 @@
 
   if (--(op->duration) < 0)
     {
-      remove_ob (op);
-      free_object (op);
+      op->remove ();
+      op->destroy (0);
       return;
     }
  
@@ -322,14 +322,14 @@
   mflags = get_map_flags (tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y);
   if (mflags & P_OUT_OF_MAP)
     {
-      free_object (tmp);
+      tmp->destroy (0);
       return 0;
     }
   if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
     {
       if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
         {
-          free_object (tmp);
+          tmp->destroy (0);
           return 0;
         }
       tmp->x = op->x;
@@ -363,8 +363,8 @@
 
   if (--(op->duration) < 0)
     {
-      remove_ob (op);
-      free_object (op);
+      op->remove ();
+      op->destroy (0);
       return;
     }
   hit_map (op, 0, op->attacktype, 0);
@@ -409,8 +409,8 @@
   if (op->other_arch == NULL)
     {
       LOG (llevError, "BUG: explode_bullet(): op without other_arch\n");
-      remove_ob (op);
-      free_object (op);
+      op->remove ();
+      op->destroy (0);
       return;
     }
 
@@ -422,11 +422,11 @@
       if (env->map == NULL || out_of_map (env->map, env->x, env->y))
         {
           LOG (llevError, "BUG: explode_bullet(): env out of map\n");
-          remove_ob (op);
-          free_object (op);
+          op->remove ();
+          op->destroy (0);
           return;
         }
-      remove_ob (op);
+      op->remove ();
       op->x = env->x;
       op->y = env->y;
       insert_ob_in_map (op, env->map, op, INS_NO_MERGE | INS_NO_WALK_ON);
@@ -434,8 +434,8 @@
   else if (out_of_map (op->map, op->x, op->y))
     {
       LOG (llevError, "BUG: explode_bullet(): op out of map\n");
-      remove_ob (op);
-      free_object (op);
+      op->remove ();
+      op->destroy (0);
       return;
     }
 
@@ -444,8 +444,8 @@
   // bad at the moment that might happen from this.
   if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
     {
-      remove_ob (op);
-      free_object (op);
+      op->remove ();
+      op->destroy (0);
       return;
     }
 
@@ -466,8 +466,8 @@
 
   if ((tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) && owner && !tailor_god_spell (tmp, owner))
     {
-      remove_ob (op);
-      free_object (op);
+      op->remove ();
+      op->destroy (0);
       return;
     }
 
@@ -507,8 +507,8 @@
   /* remove the firebullet */
   if (!op->destroyed ())
     {
-      remove_ob (op);
-      free_object (op);
+      op->remove ();
+      op->destroy (0);
     }
 }
 
@@ -551,8 +551,8 @@
             {
               if (!QUERY_FLAG (op, FLAG_REMOVED))
                 {
-                  remove_ob (op);
-                  free_object (op);
+                  op->remove ();
+                  op->destroy (0);
                   return;
                 }
             }
@@ -596,8 +596,8 @@
         }
       else
         {
-          remove_ob (op);
-          free_object (op);
+          op->remove ();
+          op->destroy (0);
         }
       return;
     }
@@ -609,8 +609,8 @@
 
   if (mflags & P_OUT_OF_MAP)
     {
-      remove_ob (op);
-      free_object (op);
+      op->remove ();
+      op->destroy (0);
       return;
     }
 
@@ -622,13 +622,13 @@
         }
       else
         {
-          remove_ob (op);
-          free_object (op);
+          op->remove ();
+          op->destroy (0);
         }
       return;
     }
 
-  remove_ob (op);
+  op->remove ();
   op->x = new_x;
   op->y = new_y;
   if ((op = insert_ob_in_map (op, m, op, 0)) == NULL)
@@ -697,14 +697,14 @@
   mflags = get_map_flags (tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y);
   if (mflags & P_OUT_OF_MAP)
     {
-      free_object (tmp);
+      tmp->destroy (0);
       return 0;
     }
   if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
     {
       if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
         {
-          free_object (tmp);
+          tmp->destroy (0);
           return 0;
         }
       tmp->x = op->x;
@@ -779,8 +779,8 @@
   /* If no owner left, the spell dies out. */
   if (get_owner (op) == NULL)
     {
-      remove_ob (op);
-      free_object (op);
+      op->remove ();
+      op->destroy (0);
       return;
     }
 #endif
@@ -799,8 +799,8 @@
 
   if ((op->duration--) < 0)
     {
-      remove_ob (op);
-      free_object (op);
+      op->remove ();
+      op->destroy (0);
       return;
     }
   /* Object has hit maximum range, so don't have it move
@@ -1014,7 +1014,7 @@
       if (env->type == PLAYER)
         esrv_del_item (env->contr, op->count);
 
-      remove_ob (op);
+      op->remove ();
       op->x = env->x;
       op->y = env->y;
       if ((op = insert_ob_in_map (op, env->map, op, 0)) == NULL)
@@ -1026,8 +1026,8 @@
   // as bombs can be carried.
   if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
     {
-      remove_ob (op);
-      free_object (op);
+      op->remove ();
+      op->destroy (0);
       return;
     }
 
@@ -1231,7 +1231,7 @@
             {
               new_draw_info_format (NDI_UNIQUE, 0, op, "The %s looks stronger!", query_name (target));
               target->stats.hp = target->stats.maxhp * 2;
-              free_object (effect);
+              effect->destroy (0);
               return 0;
             }
         }
@@ -1272,8 +1272,8 @@
 
   if (op->range-- <= 0)
     {
-      remove_ob (op);
-      free_object (op);
+      op->remove ();
+      op->destroy (0);
       return;
     }
 
@@ -1284,8 +1284,8 @@
    */
   if (owner == NULL)
     {
-      remove_ob (op);
-      free_object (op);
+      op->remove ();
+      op->destroy (0);
       return;
     }
 #endif
@@ -1302,16 +1302,16 @@
        * we need to remove it if someone hasn't already done so.
        */
       if (!op->destroyed ())
-        free_object (op);
+        op->destroy (0);
 
       return;
     }
 
-  remove_ob (op);
+  op->remove ();
 
   if (!op->direction || (mflags & P_OUT_OF_MAP))
     {
-      free_object (op);
+      op->destroy (0);
       return;
     }
 
@@ -1787,7 +1787,7 @@
       m = op->map;
     }
 
-  remove_ob (op);
+  op->remove ();
   op->y = ny;
   op->x = nx;
   insert_ob_in_map (op, m, op, 0);
@@ -1876,8 +1876,8 @@
   owner = get_owner (op);
   if (op->duration == 0 || owner == NULL)
     {
-      remove_ob (op);
-      free_object (op);
+      op->remove ();
+      op->destroy (0);
       return;
     }
   op->duration--;
@@ -2201,7 +2201,7 @@
 
                     new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name);
 
-                    free_object (disease);      /* don't need this one anymore */
+                    disease->destroy (0);      /* don't need this one anymore */
                     flash = get_archetype (ARCH_DETECT_MAGIC);
                     flash->x = x;
                     flash->y = y;
@@ -2209,7 +2209,7 @@
                     insert_ob_in_map (flash, walk->map, op, 0);
                     return 1;
                   }
-                free_object (disease);
+                disease->destroy (0);
               }
         }                       /* if living creature */
     }                           /* for range of spaces */