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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.229 by root, Sat May 3 12:29:09 2008 UTC vs.
Revision 1.230 by root, Sun May 4 08:25:32 2008 UTC

     }
   else
     {
       decrease (nr);
-      object *op = object_create_clone (this);
+      object *op = deep_clone ();
       op->nrof = nr;
       return op;
     }
 }
 /*
  * create clone from object to another
  */
 object *
-object_create_clone (object *asrc)
+object::deep_clone ()
 {
+  assert (("deep_clone called on non-head object", is_head ()));
-  object *dst = 0;
+  object *dst = clone ();
-  if (!asrc)
-    return 0;
-  object *src = asrc->head_ ();
-  object *prev = 0;
+  object *prev = dst;
-  for (object *part = src; part; part = part->more)
+  for (object *part = this->more; part; part = part->more)
     {
       object *tmp = part->clone ();
-      tmp->x -= src->x;
-      tmp->y -= src->y;
-      if (!part->head)
-        {
-          dst = tmp;
-          tmp->head = 0;
-        }
-      else
-        tmp->head = dst;
+      tmp->head = dst;
-      tmp->more = 0;
-      if (prev)
-        prev->more = tmp;
+      prev->more = tmp;
       prev = tmp;
     }
-  for (object *item = src->inv; item; item = item->below)
+  for (object *item = inv; item; item = item->below)
-    insert_ob_in_ob (object_create_clone (item), dst);
+    insert_ob_in_ob (item->deep_clone (), dst);
   return dst;
 }
 /* This returns the first object in who's inventory that

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