Update copyright notice

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

diff --git a/src/lib/commands/best.c b/src/lib/commands/best.c
index 67174313dd3e6f51ab32021f30da4ccd75dd1dc1..42a3fb3d0cea0c837c8c24978dd8f98b74d9a8be 100644 (file)
--- a/src/lib/commands/best.c
+++ b/src/lib/commands/best.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2016, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,42 +14,35 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
  *  best.c: Show the best path between two sectors
- * 
+ *
  *  Known contributors to this file:
- *     
+ *     Markus Armbruster, 2011
  */
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "xy.h"
-#include "path.h"
-#include "nsc.h"
-#include "nat.h"
 #include "commands.h"
+#include "path.h"
 
 int
 best(void)
 {
     double cost;
-    s_char *s;
     struct sctstr s1, s2;
     struct nstr_sect nstr, nstr2;
-    s_char buf[1024];
+    char buf[1024];
+    size_t len;
 
     if (!snxtsct(&nstr, player->argp[1]))
        return RET_SYN;
@@ -58,21 +51,28 @@ best(void)
        return RET_SYN;
 
     while (!player->aborted && nxtsct(&nstr, &s1)) {
-       if (s1.sct_own != player->cnum)
+       if (!player->owner)
            continue;
-       snxtsct(&nstr2, player->argp[2]);
+       snxtsct_rewind(&nstr2);
        while (!player->aborted && nxtsct(&nstr2, &s2)) {
-           if (s2.sct_own != player->cnum)
+           if (!player->owner)
                continue;
-           s = BestLandPath(buf, &s1, &s2, &cost, MOB_ROAD);
-           if (s != (s_char *)0)
-               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
+           cost = path_find(s1.sct_x, s1.sct_y, s2.sct_x, s2.sct_y,
+                            player->cnum, MOB_MOVE);
+           if (cost < 0)
                pr("No owned path from %s to %s exists!\n",
                   xyas(s1.sct_x, s1.sct_y, player->cnum),
                   xyas(s2.sct_x, s2.sct_y, player->cnum));
+           else {
+               len = path_find_route(buf, sizeof(buf),
+                                     s1.sct_x, s1.sct_y,
+                                     s2.sct_x, s2.sct_y);
+               pr("Best path from %s to %s is %s%s (cost %1.3f)\n",
+                  xyas(s1.sct_x, s1.sct_y, player->cnum),
+                  xyas(s2.sct_x, s2.sct_y, player->cnum),
+                  buf, len < sizeof(buf) ? "h" : "...",
+                  cost);
+           }
        }
     }
     return 0;