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

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.29 by root, Tue Dec 12 21:39:56 2006 UTC vs.
Revision 1.31 by root, Wed Dec 13 03:28:42 2006 UTC

   LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);
 }
 archetype::archetype ()
 {
-  clear_object (&clone);        /* to initial state other also */
+  clone.clear ();        /* to initial state other also */
   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 = object::create ();
+  op = at->clone.clone ();
-  at->clone.copy_to (op);
   op->arch = at;
   op->instantiate ();
   return op;
 }
 object *
 clone_arch (int type)
 {
   archetype *at;
-  object *op = object::create ();
   if ((at = type_to_archetype (type)) == NULL)
     {
       LOG (llevError, "Can't clone archetype %d\n", type);
-      op->destroy ();
-      return NULL;
+      return 0;
     }
-  at->clone.copy_to (op);
+  object *op = at->clone.clone ();
   op->instantiate ();
   return op;
 }
 /*

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