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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.328 by root, Sun Apr 18 06:55:34 2010 UTC vs.
Revision 1.334 by root, Fri Apr 23 09:22:46 2010 UTC

 {
   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_for (op, op->carrying)
+      weight = weight_adjust_for (op, op->carrying + weight)
-             - weight_adjust_for (op, op->carrying - weight);
+             - weight_adjust_for (op, op->carrying);
       if (!weight)
         return;
       op->carrying += weight;
   sum = weight_adjust_for (this, sum);
   if (sum != carrying)
     {
       if (carrying != sum)//D
-        LOG (llevDebug, "updating weight got %ld, expected %ld (%s)\n",
+        LOG (llevDebug, "updating carrying got %ld, expected %ld (%s)\n",
              (long long)sum, (long long)carrying, debug_desc ());
       carrying = sum;
       if (object *pl = visible_to ())
    */
   /* if this is not the head or flag has been passed, don't check walk on status */
   if (!(flag & INS_NO_WALK_ON) && op->is_head ())
     {
-      if (check_move_on (op, originator))
+      if (check_move_on (op, originator, flag))
         return 0;
-      /* If we are a multi part object, lets work our way through the check
+      /* If we are a multi part object, let's work our way through the check
        * walk on's.
        */
       for (object *tmp = op->more; tmp; tmp = tmp->more)
-        if (check_move_on (tmp, originator))
+        if (check_move_on (tmp, originator, flag))
           return 0;
     }
   return op;
 }
  * MSW 2001-07-08: Check all objects on space, not just those below
  * object being inserted.  insert_ob_in_map may not put new objects
  * on top.
  */
 int
-check_move_on (object *op, object *originator)
+check_move_on (object *op, object *originator, int flags)
 {
   if (op->flag [FLAG_NO_APPLY])
     return 0;
   object *tmp;
       /* Basically same logic as above, except now for actual apply. */
       if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
           ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
         {
+          if (tmp->type == EXIT && (flags & INS_NO_AUTO_EXIT)) //TODO: temporary, fix exits instead
+            continue;
           move_apply (tmp, op, originator);
           if (op->destroyed ())
             return 1;
 {
   return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
 }
 /*
- * find_dir_2(delta-x,delta-y) will return a direction in which
+ * find_dir_2(delta-x,delta-y) will return a direction value
- * an object which has subtracted the x and y coordinates of another
+ * for running into direct [dx, dy].
- * object, needs to travel toward it.
+ * (the opposite of crossfire's find_dir_2!)
  */
 int
 find_dir_2 (int x, int y)
 {
+#if 1 // new algorithm
+  // this works by putting x, y into 16 sectors, which
+  // are not equal sized, but are a better approximation
+  // then the old algorithm, and then using a mapping
+  // table to map it into a direction value.
+  // basically, it maps these comparisons to each bit
+  // bit #3: x < 0
+  // bit #2: y < 0
+  // bit #1: x > y
+  // bit #0: x > 2y
+  static const uint8 dir[16] = {
+     4,  5,  4,  3,
+     2,  1,  2,  3,
+     6,  5,  6,  7,
+     8,  1,  8,  7,
+  };
+  int sector = 0;
+  // this is a bit ugly, but more likely to result in branchless code
+  sector |= x < 0 ? 8 : 0;
+  x      =  x < 0 ? -x : x; // abs
+  sector |= y < 0 ? 4 : 0;
+  y      =  y < 0 ? -y : y; // abs
+  if (x > y)
+    {
+      sector |= 2;
+      if (x > y * 2)
+        sector |= 1;
+    }
+  else
+    {
+      if (y > x * 2)
+        sector |= 1;
+      else if (!y)
+        return 0; // x == 0 here
+    }
+  return dir [sector];
+#else // old algorithm
   int q;
   if (y)
     q = 128 * x / y;
   else if (x)
-    q = 512 * x; // to make it > 309
+    q = -512 * x; // to make it > 309
   else
     return 0;
   if (y > 0)
+    {
+      if (q < -309) return 7;
+      if (q <  -52) return 6;
+      if (q <   52) return 5;
+      if (q <  309) return 4;
+      return 3;
+    }
+  else
     {
       if (q < -309) return 3;
       if (q <  -52) return 2;
       if (q <   52) return 1;
       if (q <  309) return 8;
       return 7;
     }
-  else
+#endif
-    {
-      if (q < -309) return 7;
-      if (q <  -52) return 6;
-      if (q <   52) return 5;
-      if (q <  309) return 4;
-      return 3;
-    }
 }
 /*
  * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
  * between two directions (which are expected to be absolute (see absdir())

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.328 by root, Sun Apr 18 06:55:34 2010 UTC vs. Revision 1.334 by root, Fri Apr 23 09:22:46 2010 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.328 by root, Sun Apr 18 06:55:34 2010 UTC vs.
Revision 1.334 by root, Fri Apr 23 09:22:46 2010 UTC