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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.62 by root, Mon Dec 11 23:35:37 2006 UTC vs.
Revision 1.64 by root, Tue Dec 12 21:39:56 2006 UTC

   if (settings.casting_time)
     casting_time = -1;
 }
-void object::clone (object *destination)
-{
-  *(object_copy *)destination = *this;
-  *(object_pod  *)destination = *this;
-  if (self || cb)
-    INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
-}
 /*
- * copy object first frees everything allocated by the second object,
+ * copy_to first frees everything allocated by the dst object,
- * and then copies the contends of the first object into the second
+ * and then copies the contents of itself into the second
  * object, allocating what needs to be allocated.  Basically, any
  * data that is malloc'd needs to be re-malloc/copied.  Otherwise,
  * if the first object is freed, the pointers in the new object
  * will point at garbage.
  */
 void
-copy_object (object *op2, object *op)
+object::copy_to (object *dst)
 {
-  bool is_freed = QUERY_FLAG (op, FLAG_FREED);
+  bool is_freed   = QUERY_FLAG (dst, FLAG_FREED);
-  bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);
+  bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
-  op2->clone (op);
+  *(object_copy *)dst = *this;
+  *(object_pod  *)dst = *this;
+  if (self || cb)
+    INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
   if (is_freed)
-    SET_FLAG (op, FLAG_FREED);
+    SET_FLAG (dst, FLAG_FREED);
   if (is_removed)
-    SET_FLAG (op, FLAG_REMOVED);
+    SET_FLAG (dst, FLAG_REMOVED);
-  if (op2->speed < 0)
+  if (speed < 0)
-    op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;
+    dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
   /* Copy over key_values, if any. */
-  if (op2->key_values)
+  if (key_values)
     {
       key_value *tail = 0;
       key_value *i;
-      op->key_values = 0;
+      dst->key_values = 0;
-      for (i = op2->key_values; i; i = i->next)
+      for (i = key_values; i; i = i->next)
         {
           key_value *new_link = new key_value;
           new_link->next = 0;
           new_link->key = i->key;
           new_link->value = i->value;
           /* Try and be clever here, too. */
-          if (!op->key_values)
+          if (!dst->key_values)
             {
-              op->key_values = new_link;
+              dst->key_values = new_link;
               tail = new_link;
             }
           else
             {
               tail->next = new_link;
               tail = new_link;
             }
         }
     }
-  update_ob_speed (op);
+  update_ob_speed (dst);
 }
 /*
  * If an object with the IS_TURNABLE() flag needs to be turned due
  * to the closest player being on the other side, this function can
   if (QUERY_FLAG (this, FLAG_FRIENDLY))
     remove_friendly_object (this);
   if (!QUERY_FLAG (this, FLAG_REMOVED))
-    remove_ob (this);
+    remove ();
   SET_FLAG (this, FLAG_FREED);
   if (more)
     {
           while (op)
             {
               object *tmp = op->below;
-              remove_ob (op);
+              op->remove ();
               if (QUERY_FLAG (op, FLAG_STARTEQUIP)
                   || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
-                free_object (op);
+                op->destroy ();
               else
                 {
                   op->x = x;
                   op->y = y;
                   insert_ob_in_map (op, map, 0, 0);     /* Insert in same map as the envir */
       op->carrying -= weight;
       op = op->env;
     }
 }
-/* remove_ob(op):
+/* op->remove ():
  *   This function removes the object op from the linked list of objects
  *   which it is currently tied to.  When this function is done, the
  *   object will have no environment.  If the object previously had an
  *   environment, the x and y coordinates will be updated to
  *   the previous environment.
         {
           top->nrof += op->nrof;
 /*      CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
           op->weight = 0;       /* Don't want any adjustements now */
-          remove_ob (op);
+          op->destroy ();
-          free_object (op);
           return top;
         }
     }
   return 0;
   if (op->nrof && !(flag & INS_NO_MERGE))
     for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
       if (CAN_MERGE (op, tmp))
         {
           op->nrof += tmp->nrof;
-          remove_ob (tmp);
+          tmp->destroy ();
-          free_object (tmp);
         }
   CLEAR_FLAG (op, FLAG_APPLIED);        /* hack for fixing F_APPLIED in items of dead people */
   CLEAR_FLAG (op, FLAG_INV_LOCKED);
     tmp1;
   /* first search for itself and remove any old instances */
   for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
-    {
-      if (!strcmp (tmp->arch->name, arch_string))       /* same archetype */
+    if (!strcmp (tmp->arch->name, arch_string))       /* same archetype */
-        {
+      tmp->destroy ();
-          remove_ob (tmp);
-          free_object (tmp);
-        }
-    }
   tmp1 = arch_to_object (archetype::find (arch_string));
   tmp1->x = op->x;
   tmp1->y = op->y;
  */
 object *
 get_split_ob (object *orig_ob, uint32 nr)
 {
-  object *
+  object *newob;
-    newob;
-  int
-    is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
+  int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
   if (orig_ob->nrof < nr)
     {
       sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
       return NULL;
     }
   newob = object_create_clone (orig_ob);
   if ((orig_ob->nrof -= nr) < 1)
-    {
+    orig_ob->destroy (1);
-      if (!is_removed)
-        remove_ob (orig_ob);
-      free_object2 (orig_ob, 1);
-    }
   else if (!is_removed)
     {
       if (orig_ob->env != NULL)
         sub_weight (orig_ob->env, orig_ob->weight * nr);
       if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
               esrv_send_item (tmp, op);
             }
         }
       else
         {
-          remove_ob (op);
+          op->remove ();
           op->nrof = 0;
           if (tmp)
             {
               esrv_del_item (tmp->contr, op->count);
             }
       if (i < op->nrof)
         op->nrof -= i;
       else
         {
-          remove_ob (op);
+          op->remove ();
           op->nrof = 0;
         }
       /* Since we just removed op, op->above is null */
       for (tmp = above; tmp != NULL; tmp = tmp->above)
   if (op->nrof)
     return op;
   else
     {
-      free_object (op);
+      op->destroy ();
       return NULL;
     }
 }
 /*
     src = src->head;
   prev = 0;
   for (part = src; part; part = part->more)
     {
-      tmp = get_object ();
+      tmp = object::create ();
-      copy_object (part, tmp);
+      part->copy_to (tmp);
       tmp->x -= src->x;
       tmp->y -= src->y;
       if (!part->head)
         {
     }
   fprintf (tempfile, obstr);
   fclose (tempfile);
-  op = get_object ();
+  op = object::create ();
   object_thawer thawer (filename);
   if (thawer)
     load_object (thawer, op, 0);

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.62 by root, Mon Dec 11 23:35:37 2006 UTC vs. Revision 1.64 by root, Tue Dec 12 21:39:56 2006 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.62 by root, Mon Dec 11 23:35:37 2006 UTC vs.
Revision 1.64 by root, Tue Dec 12 21:39:56 2006 UTC