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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.231 by root, Sun May 4 11:12:40 2008 UTC vs.
Revision 1.233 by root, Tue May 6 18:47:32 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;
    * 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))

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