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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.228 by root, Sat May 3 11:14:50 2008 UTC vs.
Revision 1.236 by root, Tue May 6 20:08:37 2008 UTC

   return 0;
 }
 // adjust weight per container type ("of holding")
 static sint32
-weight_adjust (object *op, sint32 weight)
+weight_adjust_for (object *op, sint32 weight)
 {
   return op->type == CONTAINER
          ? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
          : weight;
 }
 static void
 adjust_weight (object *op, sint32 weight)
 {
   while (op)
     {
+      // adjust by actual difference to account for rounding errors
+      // i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
-      weight = weight_adjust (op, weight);
+      weight = weight_adjust_for (op, op->carrying)
+             - weight_adjust_for (op, op->carrying - weight);
       if (!weight)
         return;
       op->carrying += weight;
         op->update_weight ();
       sum += op->total_weight ();
     }
-  sum = weight_adjust (this, sum);
+  sum = weight_adjust_for (this, sum);
   if (sum != carrying)
     {
       carrying = sum;
     nodrop = 1;
     alloc ();
     in_memory = MAP_ACTIVE;
   }
+  ~freed_map ()
+  {
+    destroy ();
+  }
 } freed_map; // freed objects are moved here to avoid crashes
 void
 object::do_destroy ()
 {
         esrv_del_item (pl->contr, count);
       flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
       adjust_weight (env, -total_weight ());
+      // make sure cmov optimisation is applicable
       *(above ? &above->below : &env->inv) = below;
+      *(below ? &below->above : &above   ) = above; // &above is just a dummy
-      if (below)
+      above = 0;
-        below->above = above;
+      below = 0;
+      env   = 0;
       /* we set up values so that it could be inserted into
        * the map, but we don't actually do that - it is up
        * to the caller to decide what we want to do.
        */
       map   = env->map;
       x     = env->x;
       y     = env->y;
-      above = 0;
-      below = 0;
-      env   = 0;
       /* NO_FIX_PLAYER is set when a great many changes are being
        * made to players inventory.  If set, avoiding the call
        * to save cpu time.
        */
           esrv_del_item (pl->contr, count);
         }
       /* link the object above us */
-      if (above)
+      // re-link, make sure compiler can easily use cmove
-        above->below = below;
+      *(above ? &above->below : &ms.top) = below;
-      else
+      *(below ? &below->above : &ms.bot) = above;
-        ms.top = below;       /* we were top, set new top */
-      /* Relink the object below us, if there is one */
-      if (below)
-        below->above = above;
-      else
-        {
-          /* Nothing below, which means we need to relink map object for this space
-           * use translated coordinates in case some oddness with map tiling is
-           * evident
-           */
-          if (GET_MAP_OB (map, x, y) != this)
-            LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ());
-          ms.bot = above;      /* goes on above it. */
-        }
       above = 0;
       below = 0;
       if (map->in_memory == MAP_SAVING)
    * of areas of callers (eg, anything that uses find_free_spot would now
    * need extra work
    */
   if (!xy_normalise (m, op->x, op->y))
     {
-      op->destroy (1);
+      op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
       return 0;
     }
   if (object *more = op->more)
     if (!insert_ob_in_map (more, m, originator, flag))
     }
   else
     {
       decrease (nr);
-      object *op = object_create_clone (this);
+      object *op = deep_clone ();
       op->nrof = nr;
       return op;
     }
 }
       LOG (llevError, "Present_arch called outside map.\n");
       return NULL;
     }
   for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
-    if (tmp->arch == at)
+    if (tmp->arch->archname == at->archname)
       return tmp;
   return NULL;
 }
  * The first matching object is returned, or NULL if none.
  */
 object *
 present_arch_in_ob (const archetype *at, const object *op)
 {
-  for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
+  for (object *tmp = op->inv; tmp; tmp = tmp->below)
-    if (tmp->arch == at)
+    if (tmp->arch->archname == at->archname)
       return tmp;
   return NULL;
 }
 /*
  * 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

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.228 by root, Sat May 3 11:14:50 2008 UTC vs. Revision 1.236 by root, Tue May 6 20:08:37 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.228 by root, Sat May 3 11:14:50 2008 UTC vs.
Revision 1.236 by root, Tue May 6 20:08:37 2008 UTC