Update copyright notice

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

diff --git a/src/lib/commands/path.c b/src/lib/commands/path.c
index 12ca7756613cdda555fc70536a4eac6768ffbf12..b0b0d208369cc9d6396486af734f01c4f820e44c 100644 (file)
--- a/src/lib/commands/path.c
+++ b/src/lib/commands/path.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -34,17 +34,10 @@
 
 #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)
@@ -58,13 +51,13 @@ path(void)
     coord cx, cy;
     int i;
     int y;
-    s_char *pp, *p;
+    char *pp, *p;
     /* Note this is not re-entrant anyway, so we keep the buffers
        around */
-    static s_char *mapbuf = NULL;
-    static s_char **map = NULL;
+    static char *mapbuf = NULL;
+    static char **map = NULL;
     double move_cost;
-    s_char buf[1024];
+    char buf[1024];
 
     if (!(p = getstarg(player->argp[1], "from sector : ", buf)) ||
        !sarg_xy(p, &cx, &cy) || !getsect(cx, cy, &sect))
@@ -74,7 +67,7 @@ path(void)
        return RET_FAIL;
     }
     getsect(sect.sct_dist_x, sect.sct_dist_y, &dsect);
-    pp = BestDistPath(buf, &sect, &dsect, &move_cost, MOB_ROAD);
+    pp = BestDistPath(buf, &sect, &dsect, &move_cost);
     if (!pp) {
        pr("No path possible from %s to distribution sector %s\n",
           xyas(sect.sct_x, sect.sct_y, player->cnum),
@@ -82,9 +75,9 @@ path(void)
        return RET_FAIL;
     }
     if (!mapbuf)
-       mapbuf = malloc((WORLD_Y * MAPWIDTH(3)) * sizeof(s_char));
+       mapbuf = malloc(WORLD_Y * MAPWIDTH(3));
     if (!map) {
-       map = malloc(WORLD_Y * sizeof(s_char *));
+       map = malloc(WORLD_Y * sizeof(char *));
        if (map && mapbuf) {
            for (i = 0; i < WORLD_Y; i++)
                map[i] = &mapbuf[MAPWIDTH(3) * i];
@@ -102,7 +95,7 @@ path(void)
     snxtsct_area(&ns, &absrange);
     natp = getnatp(player->cnum);
     xyrelrange(natp, &absrange, &relrange);
-    blankfill((s_char *)mapbuf, &ns.range, 3);
+    blankfill(mapbuf, &ns.range, 3);
     for (; *pp; ++pp) {
        i = diridx(*pp);
        if (i == DIR_STOP)
@@ -112,7 +105,6 @@ path(void)
               3);
        cx += diroff[i][0];
        cy += diroff[i][1];
-       ++pp;
     }
     border(&relrange, "     ", " ");
     while (nxtsct(&ns, &sect)) {