Update copyright notice

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

diff --git a/src/lib/commands/foll.c b/src/lib/commands/foll.c
index 60fd41f962fc9968d1ea863a9119b2294f4831f9..42c65dbf1a7e98be77568c02344f8b2e87d10c53 100644 (file)
--- a/src/lib/commands/foll.c
+++ b/src/lib/commands/foll.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2000, 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,47 +19,41 @@
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
  *  foll.c: Set leader of a set of ships
- * 
+ *
  *  Known contributors to this file:
  *     Robert Forsman
  */
 
-#include <ctype.h>
-#include "misc.h"
-#include "player.h"
-#include "var.h"
-#include "ship.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
-#include "nat.h"
+#include <config.h>
+
 #include "commands.h"
 #include "optlist.h"
+#include "ship.h"
 
 int
 foll(void)
 {
     struct shpstr ship;
-    s_char *cp;
+    char *cp;
     int good, leader, count = 0;
     coord x, y;
     struct nstr_item nstr;
-    s_char buf[1024];
+    char buf[1024];
 
     if (!opt_SAIL) {
        pr("The SAIL option is not enabled, so this command is not valid.\n");
        return RET_FAIL;
     }
-    if (!snxtitem(&nstr, EF_SHIP, player->argp[1]))
+    if (!snxtitem(&nstr, EF_SHIP, player->argp[1], NULL))
        return RET_SYN;
-    cp = getstarg(player->argp[2], "leader?", buf);
+    cp = getstarg(player->argp[2], "leader? ", buf);
     if (cp == 0)
        cp = "";
     good = sscanf(cp, "%d", &leader);
@@ -73,12 +67,12 @@ foll(void)
     }
     x = ship.shp_x;
     y = ship.shp_y;
-    while (nxtitem(&nstr, (s_char *)&ship)) {
+    while (nxtitem(&nstr, &ship)) {
        if (!player->owner)
            continue;
        if (ship.shp_x != x || ship.shp_y != y) {
-           pr("Ship #%d not in same sector as #%d\n", ship.shp_uid,
-              leader);
+           pr("Ship #%d not in same sector as #%d\n",
+              ship.shp_uid, leader);
            continue;
        }
        if (ship.shp_uid == leader) {
@@ -94,7 +88,6 @@ foll(void)
        ship.shp_mission = 0;
        *ship.shp_path = 'f';
        ship.shp_path[1] = 0;
-/*             sprintf(ship.shp_path,"f%d",leader);*/
        ship.shp_follow = leader;
        pr("Ship #%d follows #%d.\n", ship.shp_uid, leader);
        putship(ship.shp_uid, &ship);