--- deliantra/server/common/map.C	2006/12/11 19:46:46	1.38
+++ deliantra/server/common/map.C	2006/12/12 20:53:02	1.39
@@ -594,7 +594,7 @@
         }
     }
 
-  free_object (op);
+  op->destroy (0);
   link_multipart_objects (m);
 }
 
@@ -1310,8 +1310,8 @@
                 clean_object (op);
                 if (QUERY_FLAG (op, FLAG_IS_LINKED))
                   remove_button_link (op);
-                remove_ob (op);
-                free_object (op);
+                op->remove ();
+                op->destroy (0);
               }
           }
       }
@@ -1519,8 +1519,8 @@
       clean_object (tmp);
       if (QUERY_FLAG (tmp, FLAG_IS_LINKED))
         remove_button_link (tmp);
-      remove_ob (tmp);
-      free_object (tmp);
+      tmp->remove ();
+      tmp->destroy (0);
     }
 }
 
@@ -1555,8 +1555,8 @@
              */
             if (m->in_memory == MAP_IN_MEMORY)
               clean_object (op);
-            remove_ob (op);
-            free_object (op);
+            op->remove ();
+            op->destroy (0);
           }
       }
 }