--- deliantra/server/common/treasure.C	2006/12/10 20:15:57	1.22
+++ deliantra/server/common/treasure.C	2006/12/12 20:53:02	1.23
@@ -459,12 +459,12 @@
   /* Don't want to free the object we are about to return */
   tmp = ob->inv;
   if (tmp != NULL)
-    remove_ob (tmp);
+    tmp->remove ();
 
   if (ob->inv)
     LOG (llevError, "In generate treasure, created multiple objects.\n");
 
-  free_object (ob);
+  ob->destroy (0);
   return tmp;
 }
 
@@ -1001,8 +1001,8 @@
           case RING:
             if (op->arch == NULL)
               {
-                remove_ob (op);
-                free_object (op);
+                op->remove ();
+                op->destroy (0);
                 op = NULL;
                 break;
               }
@@ -1515,8 +1515,8 @@
           while (op->inv)
             {
               tmp_obj = op->inv;
-              remove_ob (tmp_obj);
-              free_object (tmp_obj);
+              tmp_obj->remove ();
+              tmp_obj->destroy (0);
             }
 
           tmp_obj = arch_to_object (change->other_arch);