Update copyright notice

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

diff --git a/src/lib/commands/dist.c b/src/lib/commands/dist.c
index 228fe1b08f382a1226fc24bdab100e36021bd2e6..70b484b1880b61ca8adb841f74ca2bf60c1a19fe 100644 (file)
--- a/src/lib/commands/dist.c
+++ b/src/lib/commands/dist.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2015, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -30,6 +30,7 @@
  *     Dave Pare, 1986
  *     Thomas Ruschak, 1993 (rewritten)
  *     Steve McClure, 1998
+ *     Markus Armbruster, 2008-2011
  */
 
 #include <config.h>
@@ -46,7 +47,7 @@ dist(void)
     struct sctstr sect, dsect, tsect;
     struct nstr_sect nstr;
     char *p;
-    double move_cost = 0.0;
+    double move_cost;
     coord dstx, dsty;
     char buf[1024];
 
@@ -64,10 +65,10 @@ dist(void)
                pr("distributes to %s, not owned by you.\n",
                   xyas(tsect.sct_x, tsect.sct_y, player->cnum));
            else
-               pr("distributes to %s. \n",
+               pr("distributes to %s.\n",
                   xyas(tsect.sct_x, tsect.sct_y, player->cnum));
        } else
-           pr("has no dist sector. \n");
+           pr("has no dist sector.\n");
        p = getstarg(player->argp[2], "Distribution sector? ", buf);
        if (!p)
            return RET_SYN;
@@ -90,7 +91,9 @@ dist(void)
            pr("Warning: you don't own %s!\n",
               xyas(dsect.sct_x, dsect.sct_y, player->cnum));
 
-       if (!BestDistPath(buf, &sect, &dsect, &move_cost)) {
+       move_cost = path_find(sect.sct_x, sect.sct_y, dstx, dsty,
+                             player->cnum, MOB_MOVE);
+       if (move_cost < 0) {
            pr("No owned path from %s to %s.\n",
               xyas(dsect.sct_x, dsect.sct_y, player->cnum),
               xyas(sect.sct_x, sect.sct_y, player->cnum));