--- deliantra/server/random_maps/treasure.C	2006/09/16 22:24:13	1.7
+++ deliantra/server/random_maps/treasure.C	2006/12/12 20:53:03	1.8
@@ -211,7 +211,7 @@
   i = find_first_free_spot (the_chest, map, x, y);
   if (i == -1)
     {
-      free_object (the_chest);
+      the_chest->destroy (0);
       return NULL;
     }
   xl = x + freearr_x[i];
@@ -680,8 +680,8 @@
       {
         if (tmp->head)
           tmp = tmp->head;
-        remove_ob (tmp);
-        free_object (tmp);
+        tmp->remove ();
+        tmp->destroy (0);
         tmp = get_map_ob (map, x, y);
         if (tmp == NULL)
           break;
@@ -850,8 +850,8 @@
           new_door->face = door->face;
           new_door->x = door->x;
           new_door->y = door->y;
-          remove_ob (door);
-          free_object (door);
+          door->remove ();
+          door->destroy (0);
           doorlist[i] = new_door;
           insert_ob_in_map (new_door, map, NULL, 0);
           sprintf (keybuf, "%d", (int) RANDOM ());
@@ -877,8 +877,8 @@
               retrofit_joined_wall (map, door->x, door->y + 1, 0, RP);
               door->face = wallface->face;
               if (!QUERY_FLAG (wallface, FLAG_REMOVED))
-                remove_ob (wallface);
-              free_object (wallface);
+                wallface->remove ();
+              wallface->destroy (0);
             }
         }
     }