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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.232 by root, Tue May 6 18:09:42 2008 UTC vs.
Revision 1.234 by root, Tue May 6 18:47:52 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;

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