Update copyright notice

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

diff --git a/src/lib/commands/dist.c b/src/lib/commands/dist.c
index 001670c0aa8f32558e43cdbdce2d63791c16ff34..9ef45671ebdd98d734798de021b7abfeebb12161 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-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,30 +19,24 @@
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
  *  dist.c: Name distribution sector for a given range of sectors
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1986
- *     Thomas Ruschak, 1993 (rewritten) 
+ *     Thomas Ruschak, 1993 (rewritten)
  *     Steve McClure, 1998
  */
 
-#include "misc.h"
-#include "player.h"
-#include "var.h"
-#include "xy.h"
-#include "sect.h"
-#include "nsc.h"
-#include "nat.h"
-#include "file.h"
-#include "path.h"
+#include <config.h>
+
 #include "commands.h"
+#include "path.h"
 
 /*
  * distribute <SECT> <DISTSECT|.|h>
@@ -52,14 +46,14 @@ dist(void)
 {
     struct sctstr sect, dsect, tsect;
     struct nstr_sect nstr;
-    s_char *path, *p;
+    char *p;
     double move_cost = 0.0;
     coord dstx, dsty;
-    s_char buf[1024];
+    char buf[1024];
 
     if (!snxtsct(&nstr, player->argp[1]))
        return RET_SYN;
-    while (!player->aborted && nxtsct(&nstr, &sect)) {
+    while (nxtsct(&nstr, &sect)) {
        if (!player->owner)
            continue;
        pr("%s at %s ", dchr[sect.sct_type].d_name,
@@ -76,20 +70,18 @@ dist(void)
        } else
            pr("has no dist sector. \n");
        p = getstarg(player->argp[2], "Distribution sector? ", buf);
-       if (p && (*p == 0))
+       if (!p)
+           return RET_SYN;
+       if (!*p)
            continue;
-
        if (!check_sect_ok(&sect))
            continue;
 
-       if (p && (*p != '.') && (*p != 'h') && (!sarg_xy(p, &dstx, &dsty)))
-           return RET_SYN;
-
-       if (p && ((*p == '.') || (*p == 'h'))) {
+       if (*p == '.' || *p == 'h') {
            dstx = sect.sct_x;
            dsty = sect.sct_y;
-       }
-
+       } else if (!sarg_xy(p, &dstx, &dsty))
+           return RET_SYN;
        if (!getsect(dstx, dsty, &dsect)) {
            pr("Bad sector.\n");
            return RET_FAIL;
@@ -99,9 +91,7 @@ dist(void)
            pr("Warning: you don't own %s!\n",
               xyas(dsect.sct_x, dsect.sct_y, player->cnum));
 
-       path = BestDistPath(buf, &sect, &dsect, &move_cost, MOB_ROAD);
-
-       if (path == (s_char *)0) {
+       if (!BestDistPath(buf, &sect, &dsect, &move_cost)) {
            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));