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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.21 by root, Sat Sep 9 21:48:28 2006 UTC vs.
Revision 1.23 by root, Sun Sep 10 14:54:02 2006 UTC

 /*
  * static char *rcsid_object_c =
- *   "$Id: object.C,v 1.21 2006/09/09 21:48:28 root Exp $";
+ *   "$Id: object.C,v 1.23 2006/09/10 14:54:02 root Exp $";
  */
 /*
     CrossFire, A Multiplayer game for X-windows
   SET_FLAG (this, FLAG_REMOVED);
 }
 void object::clone (object *destination)
 {
-  *(object_copy *)destination = *(object_copy *)this;
+  *(object_copy *)destination = *this;
-  *(object_pod  *)destination = *(object_pod  *)this;
+  *(object_pod  *)destination = *this;
   if (self || cb)
     INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
 }
   if (op2->speed < 0)
     op->speed_left = op2->speed_left - RANDOM() % 200 / 100.0;
   /* Copy over key_values, if any. */
-  if (op2->key_values != NULL)
+  if (op2->key_values)
     {
-      key_value *tail = NULL;
+      key_value *tail = 0;
       key_value *i;
-      op->key_values = NULL;
+      op->key_values = 0;
-      for (i = op2->key_values; i != NULL; i = i->next)
+      for (i = op2->key_values; i; i = i->next)
         {
           key_value *new_link = new key_value;
-          new_link->next  = NULL;
+          new_link->next  = 0;
           new_link->key   = i->key;
           new_link->value = i->value;
           /* Try and be clever here, too. */
-          if (op->key_values == NULL)
+          if (!op->key_values)
             {
               op->key_values = new_link;
               tail = new_link;
             }
           else
   mortals.clear ();
 }
 object::object ()
 {
-  count = ++ob_count;
-  prev = 0;
-  next = objects;
-  if (objects)
-    objects->prev = this;
-  objects = this;
   SET_FLAG (this, FLAG_REMOVED);
   expmul = 1.0;
   face = blank_face;
   attacked_by_count = -1;
 }
 object::~object ()
 {
+  free_key_values (this);
 }
+void
+object::link ()
+{
+  count = ++ob_count;
+  prev = 0;
+  next = objects;
+  if (objects)
+    objects->prev = this;
+  objects = this;
+}
+void
+object::unlink ()
+{
+  count = 0;
+  /* Remove this object from the list of used objects */
+  if (prev) prev->next = next;
+  if (next) next->prev = prev;
+  if (this == objects) objects = next;
+}
 object *object::create ()
 {
-  return new object;
+  object *op = new object;
+  op->link ();
+  return op;
 }
 /*
  * free_object() frees everything allocated by an object, removes
  * it from the list of used objects, and puts it on the list of
   /* Remove object from the active list */
   speed = 0;
   update_ob_speed (this);
+  unlink ();
   SET_FLAG (this, FLAG_FREED);
-  mortalise ();
-}
-void
-object::mortalise ()
-{
-  count = 0;
-  /* Remove this object from the list of used objects */
-  if (prev) prev->next = next;
-  if (next) next->prev = prev;
-  if (this == objects) objects = next;
-  free_key_values (this);
   mortals.push_back (this);
 }
 /*

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.21 by root, Sat Sep 9 21:48:28 2006 UTC vs. Revision 1.23 by root, Sun Sep 10 14:54:02 2006 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.21 by root, Sat Sep 9 21:48:28 2006 UTC vs.
Revision 1.23 by root, Sun Sep 10 14:54:02 2006 UTC