Update copyright notice.

[empserver] / src / lib / gen / mapdist.c

diff --git a/src/lib/gen/mapdist.c b/src/lib/gen/mapdist.c
index f728bc6d7d0323021a355835d8f0c3eff6895a97..ede7a0b1426938a79e92b845bd3872c2948d0c75 100644 (file)
--- a/src/lib/gen/mapdist.c
+++ b/src/lib/gen/mapdist.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,9 +19,9 @@
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
@@ -33,86 +33,78 @@
 
 /*
  * mapdist returns (integer) distance between two sectors.
- * mapdsq returns the square of the distance -- more efficient.
  */
 
+#include <config.h>
+
 #include "misc.h"
-#include "gen.h"
 #include "optlist.h"
+#include "prototypes.h"
 
 int
 diffx(int x1, int x2)
 {
-       int     dx;
+    int dx;
 
-       dx = x1 - x2;
-       dx = dx % WORLD_X;
-       if (dx > WORLD_X/2)
-               dx = dx - WORLD_X;
-       if (dx < -WORLD_X/2)
-               dx = dx + WORLD_X;
-       return dx; 
+    dx = x1 - x2;
+    dx = dx % WORLD_X;
+    if (dx > WORLD_X / 2)
+       dx = dx - WORLD_X;
+    if (dx < -WORLD_X / 2)
+       dx = dx + WORLD_X;
+    return dx;
 }
 
 int
 diffy(int y1, int y2)
 {
-       int     dy;
+    int dy;
 
-       dy = y1 - y2;
-       dy = dy % WORLD_Y;
-       if (dy > WORLD_Y/2)
-               dy = dy - WORLD_Y;
-       if (dy < -WORLD_Y/2)
-               dy = dy + WORLD_Y;
-       return dy; 
+    dy = y1 - y2;
+    dy = dy % WORLD_Y;
+    if (dy > WORLD_Y / 2)
+       dy = dy - WORLD_Y;
+    if (dy < -WORLD_Y / 2)
+       dy = dy + WORLD_Y;
+    return dy;
 }
 
 int
 deltax(int x1, int x2)
 {
-       int     dx;
+    int dx;
 
-       dx = abs(x1 - x2);
-       dx = dx % WORLD_X;
-       if (dx > WORLD_X/2)
-               dx = WORLD_X - dx;
-       return dx; 
+    dx = abs(x1 - x2);
+    dx = dx % WORLD_X;
+    if (dx > WORLD_X / 2)
+       dx = WORLD_X - dx;
+    return dx;
 }
 
 int
 deltay(int y1, int y2)
 {
-       int     dy;
+    int dy;
 
-       dy = abs(y1 - y2);
-       dy = dy % WORLD_Y;
-       if (dy > WORLD_Y/2)
-               dy = WORLD_Y - dy;
-       return dy; 
+    dy = abs(y1 - y2);
+    dy = dy % WORLD_Y;
+    if (dy > WORLD_Y / 2)
+       dy = WORLD_Y - dy;
+    return dy;
 }
 
 int
 mapdist(int x1, int y1, int x2, int y2)
 {
-       int     dx, dy;
-
-       x1 = x1 % WORLD_X;
-       y1 = y1 % WORLD_Y;
-       x2 = x2 % WORLD_X;
-       y2 = y2 % WORLD_Y;
-       dx = deltax(x1, x2);
-       dy = deltay(y1, y2);
-       if (dx > dy)
-               return (dx - dy) / 2 + dy;
-       return dy;
-}
-
-int
-mapdsq(int x1, int y1, int x2, int y2)
-{
-       int     sq;
+    int dx, dy;
 
-       sq = mapdist(x1, y1, x2, y2);
-       return sq * sq;
+    x1 = x1 % WORLD_X;
+    y1 = y1 % WORLD_Y;
+    x2 = x2 % WORLD_X;
+    y2 = y2 % WORLD_Y;
+    dx = deltax(x1, x2);
+    dy = deltay(y1, y2);
+    if (dx > dy)
+       return (dx - dy) / 2 + dy;
+    return dy;
 }