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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.40 by root, Thu Sep 14 00:07:15 2006 UTC vs.
Revision 1.41 by root, Thu Sep 14 01:12:28 2006 UTC

   for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)
     if ((*i)->refcnt)
       ++i; // further delay freeing
     else
       {
+        //printf ("free_mortal(%p,%ld,%ld)\n", *i, pticks, (*i)->count);//D
         //freed.push_back (*i);//D
         delete *i;
         mortals.erase (i);
       }
 }
 void object::link ()
 {
   count = ++ob_count;
+  uuid = gen_uuid ();
   prev = 0;
   next = objects;
   if (objects)
   objects = this;
 }
 void object::unlink ()
 {
-  count = 0;
+  //count = 0;//D
-  uuid = gen_uuid ();
+  if (!prev && !next) return;//D
   if (this == objects)
     objects = next;
   /* Remove this object from the list of used objects */
-  if (prev)
-    {
-      prev->next = next;
+  if (prev) prev->next = next;
+  if (next) next->prev = prev;
-      prev = 0;
+  prev = 0;
-    }
-  if (next)
-    {
-      next->prev = prev;
-      next = 0;
+  next = 0;
-    }
 }
 object *object::create ()
 {
   object *op;
   if (!QUERY_FLAG (this, FLAG_REMOVED))
     remove_ob (this);
   SET_FLAG (this, FLAG_FREED);
+  //printf ("free(%p,%ld,%ld)\n", this, pticks, count);//D
   if (more)
     {
       more->free (free_inventory);
       more = 0;
   if (tempfile == NULL)
     {
       LOG (llevError, "Error - Unable to access load object temp file\n");
       return NULL;
-    };
+    }
   fprintf (tempfile, obstr);
   fclose (tempfile);
   op = get_object ();

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