License upgrade to GPL version 3 or later

[empserver] / src / lib / subs / aswplnsubs.c

diff --git a/src/lib/subs/aswplnsubs.c b/src/lib/subs/aswplnsubs.c
index fe474d3cad60f070ef1d1ed0b7bbae0db5f1d354..eb7be94d4c5f8ca6cbafb3f875696e817e3bc51a 100644 (file)
--- a/src/lib/subs/aswplnsubs.c
+++ b/src/lib/subs/aswplnsubs.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-2011, 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,33 +14,33 @@
  *  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.
  *
  *  ---
  *
  *  aswplnsubs.c: Various subroutines used for ASW planes
- * 
+ *
  *  Known contributors to this file:
- *  Ron Koenderink, 2004
- *     
+ *     Ron Koenderink, 2004
  */
 
-#include <stdlib.h>
-#include "misc.h"
+#include <config.h>
+
 #include "file.h"
-#include "ship.h"
+#include "misc.h"
+#include "nat.h"
 #include "plane.h"
 #include "prototypes.h"
+#include "ship.h"
 
 int
-on_shiplist(short uid, struct shiplist *head)
+on_shiplist(int uid, struct shiplist *head)
 {
     struct shiplist *s;
 
@@ -54,7 +54,7 @@ on_shiplist(short uid, struct shiplist *head)
 }
 
 void
-add_shiplist(short uid, struct shiplist **head)
+add_shiplist(int uid, struct shiplist **head)
 {
     struct shiplist *s, *s2;
 
@@ -70,7 +70,7 @@ add_shiplist(short uid, struct shiplist **head)
     }
 
     s = malloc(sizeof(struct shiplist));
-    if (s2 != NULL) 
+    if (s2 != NULL)
        s2->next = s;
     else
        *head = s;
@@ -98,7 +98,6 @@ print_shiplist(struct shiplist *head)
 {
     struct shiplist *s;
     int first;
-    struct mchrstr *mp;
     struct shpstr ship;
 
     s = head;
@@ -106,7 +105,6 @@ print_shiplist(struct shiplist *head)
 
     while (s != NULL) {
        getship(s->uid, &ship);
-       mp = &mchr[(int)ship.shp_type];
        if (first) {
            pr(" #          player->owner           eff        type\n");
            first = 0;