Change distance calculations to conform to OpenBW (@N00byEdge)

Author: JasperGeurtz

src/main/java/bwapi/Position.java

@@ -18,15 +18,15 @@ public Position(final int x, final int y) {
   }
 
   private static int getApproxDistance(final int x1, final int y1, final int x2, final int y2) {
-        int min = Math.abs(x1 - x2);
-        int max = Math.abs(y1 - y2);
+        int max = Math.abs(x1 - x2);
+        int min = Math.abs(y1 - y2);
         if (max < min) {
             final int temp = min;
             min = max;
             max = temp;
         }
 
-        if (min < (max >> 2)) {
+        if (min <= (max >> 2)) {
             return max;
         }
 

src/main/java/bwapi/Unit.java

@@ -164,25 +164,19 @@ public int getDistance(final Position target) {
         }
         /////// Compute distance
 
-        // retrieve left/top/right/bottom values for calculations
-        final int left = target.x - 1;
-        final int top = target.y - 1;
-        final int right = target.x + 1;
-        final int bottom = target.y + 1;
-
         // compute x distance
-        int xDist = getLeft() - right;
+        int xDist = getLeft() - target.x;
         if (xDist < 0) {
-            xDist = left - getRight();
+            xDist = target.x - (getRight() + 1);
             if (xDist < 0) {
                 xDist = 0;
             }
         }
 
         // compute y distance
-        int yDist = getTop() - bottom;
+        int yDist = getTop() - target.y;
         if (yDist < 0) {
-            yDist = top - getBottom();
+            yDist = target.y - (getBottom() + 1);
             if (yDist < 0) {
                 yDist = 0;
             }