Update copyright notice

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

diff --git a/src/lib/commands/wing.c b/src/lib/commands/wing.c
index 8da8f6f6dd0984505cfe2433c3be12505d89575d..cd14e3825387b6bd9fe1acc5bce487db23ea9149 100644 (file)
--- a/src/lib/commands/wing.c
+++ b/src/lib/commands/wing.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2005, 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,30 +14,27 @@
  *  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.
  *
  *  ---
  *
  *  wing.c: Add planes to a wing
- * 
+ *
  *  Known contributors to this file:
- *  
+ *
  */
 
+#include <config.h>
+
 #include <ctype.h>
-#include "misc.h"
-#include "player.h"
-#include "plane.h"
-#include "nsc.h"
-#include "file.h"
 #include "commands.h"
+#include "plane.h"
 
 int
 wing(void)
@@ -45,10 +42,10 @@ wing(void)
 
     struct plnstr plane;
     int count;
-    s_char *cp;
-    s_char c;
+    char *cp;
+    char c;
     struct nstr_item nstr;
-    s_char buf[1024];
+    char buf[1024];
 
     if (!(cp = getstarg(player->argp[1], "wing? ", buf)))
        return RET_SYN;
@@ -58,17 +55,19 @@ wing(void)
        return RET_SYN;
     }
     if (c == '~')
-       c = ' ';
-    if (!snxtitem(&nstr, EF_PLANE, player->argp[2]))
+       c = 0;
+    if (!snxtitem(&nstr, EF_PLANE, player->argp[2], NULL))
        return RET_SYN;
-    for (count = 0; nxtitem(&nstr, (s_char *)&plane); count++) {
-       if (plane.pln_own != player->cnum) {
-           count--;
+    count = 0;
+    while (nxtitem(&nstr, &plane)) {
+       if (plane.pln_own != player->cnum)
+           continue;
+       if (plane.pln_wing == c)
            continue;
-       }
        plane.pln_wing = c;
        putplane(plane.pln_uid, &plane);
+       count++;
     }
-    pr("%d plane%s added to wing `%c'\n", count, splur(count), c);
+    pr("%d plane%s added to wing `%1.1s'\n", count, splur(count), &c);
     return RET_OK;
 }