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

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.27 by root, Sat Dec 9 14:01:12 2006 UTC vs.
Revision 1.30 by root, Wed Dec 13 00:42:03 2006 UTC

 }
 archetype::archetype ()
 {
   clear_object (&clone);        /* to initial state other also */
-  CLEAR_FLAG (&clone, FLAG_FREED);      /* This shouldn't matter, since copy_object() */
+  CLEAR_FLAG (&clone, FLAG_FREED);      /* This shouldn't matter, since copy_to */
   SET_FLAG (&clone, FLAG_REMOVED);      /* doesn't copy these flags... */
 }
 archetype::~archetype ()
 {
         LOG (llevError, "Couldn't find archetype.\n");
       return NULL;
     }
-  op = get_object ();
+  op = at->clone.clone ();
-  copy_object (&at->clone, op);
   op->arch = at;
   op->instantiate ();
   return op;
 }
 {
   object *op;
   char buf[MAX_BUF];
   sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);
-  op = get_object ();
+  op = object::create ();
   op->name = op->name_pl = buf;
   SET_FLAG (op, FLAG_NO_PICK);
   return op;
 }
 object *
 clone_arch (int type)
 {
   archetype *at;
-  object *op = get_object ();
   if ((at = type_to_archetype (type)) == NULL)
     {
       LOG (llevError, "Can't clone archetype %d\n", type);
-      free_object (op);
-      return NULL;
+      return 0;
     }
-  copy_object (&at->clone, op);
+  object *op = at->clone.clone ();
   op->instantiate ();
   return op;
 }
 /*

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