COPYING duplicates information from README. Remove. Move GPL from

[empserver] / src / lib / commands / best.c

diff --git a/src/lib/commands/best.c b/src/lib/commands/best.c
index 39fc8b81388463ccb4aa565dc4b5fd54cc6ab419..7297fbb13116a1975922096729b61ba9743ae656 100644 (file)
--- a/src/lib/commands/best.c
+++ b/src/lib/commands/best.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.
  *
  *  ---
  *
@@ -31,16 +31,14 @@
  *     
  */
 
+#include <config.h>
+
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
-#include "item.h"
 #include "xy.h"
 #include "path.h"
 #include "nsc.h"
-#include "deity.h"
-#include "file.h"
 #include "nat.h"
 #include "commands.h"
 
@@ -48,14 +46,11 @@ int
 best(void)
 {
     double cost;
-    s_char *BestDistPath(), *BestLandPath(), *s;
+    s_char *s;
     struct sctstr s1, s2;
     struct nstr_sect nstr, nstr2;
-    int dist = 0;
     s_char buf[1024];
 
-    dist = player->argp[0][4] == 'd';
-
     if (!snxtsct(&nstr, player->argp[1]))
        return RET_SYN;
 
@@ -69,13 +64,9 @@ best(void)
        while (!player->aborted && nxtsct(&nstr2, &s2)) {
            if (s2.sct_own != player->cnum)
                continue;
-           if (dist)
-               s = BestDistPath(buf, &s1, &s2, &cost, MOB_ROAD);
-           else
-               s = BestLandPath(buf, &s1, &s2, &cost, MOB_ROAD);
+           s = BestLandPath(buf, &s1, &s2, &cost, MOB_ROAD);
            if (s != (s_char *)0)
-               pr("Best %spath from %s to %s is %s (cost %1.3f)\n",
-                  (dist ? "dist" : ""),
+               pr("Best path from %s to %s is %s (cost %1.3f)\n",
                   xyas(s1.sct_x, s1.sct_y, player->cnum),
                   xyas(s2.sct_x, s2.sct_y, player->cnum), s, cost);
            else