COPYING duplicates information from README. Remove. Move GPL from

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

diff --git a/src/lib/gen/mapdist.c b/src/lib/gen/mapdist.c
index ab9b5e9ce891714dc051fd1a0308e172a9ea6c1c..42da3b66795e48605449d040d9a0da2f92118b2a 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-2006, 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,9 +33,10 @@
 
 /*
  * 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"
@@ -107,12 +108,3 @@ mapdist(int x1, int y1, int x2, int y2)
        return (dx - dy) / 2 + dy;
     return dy;
 }
-
-int
-mapdsq(int x1, int y1, int x2, int y2)
-{
-    int sq;
-
-    sq = mapdist(x1, y1, x2, y2);
-    return sq * sq;
-}