[ViewVC] Diff of: cvs/deliantra/server/common/loader.C

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.19 by root, Thu Sep 21 00:05:24 2006 UTC vs.
Revision 1.21 by root, Tue Dec 12 20:53:02 2006 UTC

                       op_inv = tmp;
                     }
                   else
                     {
                       LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)");
-                      free_object (tmp);
+                      tmp->destroy (0);
                     }
                 }
               else
                 {
                   /* This is the actual archetype definition then */
  * override values and in c_wiz to mutate values.
  */
 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);
+  return parse_object (op, thawer, 0);
-  yy_switch_to_buffer (yycurbuf);
-  yy_delete_buffer (yybufstate);
-  yy_pop_state ();
-  return retval;
-#endif
 }
 /*
  * Initialises the array of variable-names.  Needed before any
  * objects can be loaded.  Called by init_library().
         old = tmp;
       }
   if (!(flag & 2))
     {
-      remove_ob (op);
+      op->remove ();
-      free_object (op);
+      op->destroy (0);
     }
   fp.put (op);
   fprintf (fp, "end\n");
 }

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines