[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.329 by root, Sun Apr 18 12:50:07 2010 UTC

 {
   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)
 {
   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
-    {
-      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

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