--- deliantra/server/common/loader.C	2006/09/21 00:05:24	1.19
+++ deliantra/server/common/loader.C	2006/12/12 20:53:02	1.21
@@ -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 (0);
                     }
                 }
               else
@@ -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);
 }
 
 /*
@@ -1511,8 +1501,8 @@
 
   if (!(flag & 2))
     {
-      remove_ob (op);
-      free_object (op);
+      op->remove ();
+      op->destroy (0);
     }
 
   fp.put (op);