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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.223 by root, Wed Apr 30 08:29:31 2008 UTC vs.
Revision 1.225 by root, Fri May 2 20:28:44 2008 UTC

 }
 object &
 object::operator =(const object &src)
 {
-  bool is_freed   = flag [FLAG_FREED];
+  remove ();
-  bool is_removed = flag [FLAG_REMOVED];
   *(object_copy *)this = src;
-  flag [FLAG_FREED]   = is_freed;
-  flag [FLAG_REMOVED] = is_removed;
+  flag [FLAG_REMOVED] = true;
   /* Copy over key_values, if any. */
   if (src.key_values)
     {
       key_value *tail = 0;
 object *
 object::clone ()
 {
   object *neu = create ();
   copy_to (neu);
+  neu->map = map; // not copied by copy_to
   return neu;
 }
 /*
  * If an object with the IS_TURNABLE() flag needs to be turned due
  * create clone from object to another
  */
 object *
 object_create_clone (object *asrc)
 {
-  object *dst = 0, *tmp, *src, *prev, *item;
+  object *dst = 0;
   if (!asrc)
     return 0;
-  src = asrc->head_ ();
+  object *src = asrc->head_ ();
-  prev = 0;
+  object *prev = 0;
   for (object *part = src; part; part = part->more)
     {
-      tmp = part->clone ();
+      object *tmp = part->clone ();
       tmp->x -= src->x;
       tmp->y -= src->y;
       if (!part->head)
         {
         prev->more = tmp;
       prev = tmp;
     }
-  for (item = src->inv; item; item = item->below)
+  for (object *item = src->inv; item; item = item->below)
     insert_ob_in_ob (object_create_clone (item), dst);
   return dst;
 }

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