Update copyright notice

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

diff --git a/src/lib/commands/path.c b/src/lib/commands/path.c
index 61f058f63882de5aac6a54b0106a0f910e5099d4..cf43e51ab8f7ce3e1f4c086269c98e00cda6b929 100644 (file)
--- a/src/lib/commands/path.c
+++ b/src/lib/commands/path.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-2017, 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,8 +14,7 @@
  *  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/>.
  *
  *  ---
  *
@@ -26,25 +25,19 @@
  *  ---
  *
  *  path.c: Show empire distribution paths
- * 
+ *
  *  Known contributors to this file:
  *     David Muir Sharnoff, 1986
  *     (unknown rewrite), 1989
+ *     Markus Armbruster, 2005-2011
  */
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "nsc.h"
-#include "nat.h"
-#include "file.h"
-#include "sect.h"
-#include "path.h"
-#include "map.h"
 #include "commands.h"
+#include "map.h"
 #include "optlist.h"
+#include "path.h"
 
 int
 path(void)
@@ -54,16 +47,16 @@ path(void)
     struct natstr *natp;
     struct range absrange;
     struct range relrange;
-    struct sctstr sect, dsect;
+    struct sctstr sect;
     coord cx, cy;
     int i;
     int y;
     char *pp, *p;
+    size_t len;
     /* Note this is not re-entrant anyway, so we keep the buffers
        around */
     static char *mapbuf = NULL;
     static char **map = NULL;
-    double move_cost;
     char buf[1024];
 
     if (!(p = getstarg(player->argp[1], "from sector : ", buf)) ||
@@ -73,12 +66,19 @@ path(void)
        pr("Not yours\n");
        return RET_FAIL;
     }
-    getsect(sect.sct_dist_x, sect.sct_dist_y, &dsect);
-    pp = BestDistPath(buf, &sect, &dsect, &move_cost);
-    if (!pp) {
+    if (path_find(sect.sct_x, sect.sct_y, sect.sct_dist_x, sect.sct_dist_y,
+                 player->cnum, MOB_MOVE) < 0) {
        pr("No path possible from %s to distribution sector %s\n",
           xyas(sect.sct_x, sect.sct_y, player->cnum),
-          xyas(dsect.sct_x, dsect.sct_y, player->cnum));
+          xyas(sect.sct_dist_x, sect.sct_dist_y, player->cnum));
+       return RET_FAIL;
+    }
+    len = path_find_route(buf, sizeof(buf), sect.sct_x, sect.sct_y,
+                         sect.sct_dist_x, sect.sct_dist_y);
+    if (len >= sizeof(buf)) {
+       pr("Can't handle path from %s to distribution sector %s, it's too long, sorry.\n",
+          xyas(sect.sct_x, sect.sct_y, player->cnum),
+          xyas(sect.sct_dist_x, sect.sct_dist_y, player->cnum));
        return RET_FAIL;
     }
     if (!mapbuf)
@@ -98,21 +98,19 @@ path(void)
        logerror("malloc failed in path\n");
        return RET_FAIL;
     }
-    pathrange(cx, cy, pp, 1, &absrange);
+    pathrange(cx, cy, buf, 1, &absrange);
     snxtsct_area(&ns, &absrange);
     natp = getnatp(player->cnum);
     xyrelrange(natp, &absrange, &relrange);
     blankfill(mapbuf, &ns.range, 3);
-    for (; *pp; ++pp) {
+    for (pp = buf; *pp; ++pp) {
        i = diridx(*pp);
-       if (i == DIR_STOP)
+       if (CANT_HAPPEN(i == DIR_STOP))
            break;
-       memcpy(&map[deltay(cy, ns.range.ly)][deltax(cx, ns.range.lx) * 2],
-              routech[i][0],
-              3);
-       cx += diroff[i][0];
-       cy += diroff[i][1];
-       ++pp;
+       memcpy(&map[delty(&ns.range, cy)][deltx(&ns.range, cx) * 2],
+              routech[i], 3);
+       cx = xnorm(cx + diroff[i][0]);
+       cy = ynorm(cy + diroff[i][1]);
     }
     border(&relrange, "     ", " ");
     while (nxtsct(&ns, &sect)) {