Update copyright notice

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

diff --git a/src/lib/commands/mobq.c b/src/lib/commands/mobq.c
index 57aa737059b410c0caa3bb9b1ba4f5e264b4851c..4648c7b8cfc3699fc9aee22ce4e925314137772b 100644 (file)
--- a/src/lib/commands/mobq.c
+++ b/src/lib/commands/mobq.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2013, 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,49 +14,43 @@
  *  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/>.
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
  *  mobq.c: Set the sailing mobility quota for a ship
- * 
+ *
  *  Known contributors to this file:
  *     Robert Forsman
  */
 
-#include <ctype.h>
-#include "misc.h"
-#include "player.h"
-#include "ship.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
+#include <config.h>
+
 #include "commands.h"
 #include "optlist.h"
+#include "ship.h"
 
 
 int
 mobq(void)
 {
     struct shpstr ship;
-    s_char *cp, *oldmq;
+    char *cp, *oldmq;
     int good, mobquota, count = 0;
     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;
     }
-/*     getstarg(player->argp[1], "ships? ");*/
-    if (!snxtitem(&nstr, EF_SHIP, player->argp[1]))
+    if (!snxtitem(&nstr, EF_SHIP, player->argp[1], NULL))
        return RET_SYN;
     oldmq = player->argp[2];
     if (oldmq) {
@@ -72,14 +66,14 @@ mobq(void)
            pr("warning: %d less than optimal\n", mobquota);
        }
     }
-    while (nxtitem(&nstr, (s_char *)&ship)) {
+    while (nxtitem(&nstr, &ship)) {
        if (!player->owner)
            continue;
        if (!oldmq)
            pr("Ship #%d at %s.  Old value %d.\n", ship.shp_uid,
               xyas(ship.shp_x, ship.shp_y, player->cnum),
               ship.shp_mobquota);
-       cp = getstarg(player->argp[2], "mobility quota?", buf);
+       cp = getstarg(player->argp[2], "mobility quota? ", buf);
        if (!cp)
            return RET_SYN;
        if (!check_ship_ok(&ship))