--- deliantra/server/common/loader.C	2006/09/21 00:05:24	1.19
+++ deliantra/server/common/loader.C	2006/12/12 21:39:56	1.22
@@ -558,7 +558,7 @@
                     tmp = arch_to_object (arch);
                   else
                     {
-                      tmp = get_object ();
+                      tmp = object::create ();
                       /* record the name of the broken object */
                       tmp->name = str;
                     }
@@ -595,7 +595,7 @@
                   else
                     {
                       LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)");
-                      free_object (tmp);
+                      tmp->destroy ();
                     }
                 }
               else
@@ -603,8 +603,8 @@
                   /* This is the actual archetype definition then */
                   op->arch = archetype::find (str);
 
-                  if (op->arch != NULL)
-                    copy_object (&op->arch->clone, op);
+                  if (op->arch)
+                    op->arch->clone.copy_to (op);
                   else if (!arch_init)
                     /* record the name of the broken object */
                     op->name = str;
@@ -1083,19 +1083,9 @@
 int
 set_variable (object *op, char *buf)
 {
-  return 0;
-#if 0
-  int retval;
-  object_thawer thawer (0);
+  object_thawer thawer (buf, (AV *)0);
 
-  strcpy (msgbuf, "");
-  strcpy (lorebuf, "");
-  retval = parse_object (op, thawer, 0);
-  yy_switch_to_buffer (yycurbuf);
-  yy_delete_buffer (yybufstate);
-  yy_pop_state ();
-  return retval;
-#endif
+  return parse_object (op, thawer, 0);
 }
 
 /*
@@ -1315,7 +1305,7 @@
     }
 
   /* We don't need to worry about the arch's extra fields - they
-   * will get taken care of the copy_object function.
+   * will get taken care of the copy_to method.
    */
 
   {
@@ -1510,10 +1500,7 @@
       }
 
   if (!(flag & 2))
-    {
-      remove_ob (op);
-      free_object (op);
-    }
+    op->destroy ();
 
   fp.put (op);
   fprintf (fp, "end\n");