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 7acc9c55dee40fbd62e98a3a72399e5f04ac1d72..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-2004, 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,151 +14,97 @@
  *  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
  */
 
+#include <config.h>
+
+#include "file.h"
 #include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
-#include "ship.h"
-#include "nsc.h"
 #include "nat.h"
-#include "path.h"
-#include "file.h"
-#include "queue.h"
 #include "plane.h"
-#include <fcntl.h>
-#include <ctype.h>
 #include "prototypes.h"
+#include "ship.h"
 
 int
-have_looked(u_char uid, struct shiplook *head)
-{
-    struct shiplook *s;
-
-    s = head;
-    if (s->uid == -1)
-       return 0;
-
-    while (s != ((struct shiplook *)0)) {
-       if (s->uid == uid)
-           return s->looked;
-       s = s->next;
-    }
-
-    return 0;
-}
-
-int
-have_found(u_char uid, struct shiplook *head)
+on_shiplist(int uid, struct shiplist *head)
 {
-    struct shiplook *s;
+    struct shiplist *s;
 
     s = head;
-    if (s->uid == -1)
-       return 0;
-
-    while (s != ((struct shiplook *)0)) {
+    while (s != NULL) {
        if (s->uid == uid)
-           return s->found;
+           return 1;
        s = s->next;
     }
-
     return 0;
 }
 
 void
-set_have_looked(u_char uid, struct shiplook *head)
+add_shiplist(int uid, struct shiplist **head)
 {
-    struct shiplook *s, *s2;
+    struct shiplist *s, *s2;
 
-    s = head;
-    if (s->uid == -1) {
-       s->uid = uid;
-       s->looked = 1;
-       s->found = 0;
-       s->next = (struct shiplook *)0;
-    }
+    s = *head;
+    s2 = NULL;
 
-    while (s != ((struct shiplook *)0)) {
+    while (s != NULL) {
        if (s->uid == uid) {
-           s->looked = 1;
            return;
        }
        s2 = s;
        s = s->next;
     }
 
-    s = (struct shiplook *)malloc(sizeof(struct shiplook));
-    memset(s, 0, sizeof(struct shiplook));
-    s2->next = s;
+    s = malloc(sizeof(struct shiplist));
+    if (s2 != NULL)
+       s2->next = s;
+    else
+       *head = s;
     s->uid = uid;
-    s->looked = 1;
-    s->next = (struct shiplook *)0;
+    s->next = NULL;
 }
 
 void
-set_have_found(u_char uid, struct shiplook *head)
+free_shiplist(struct shiplist **head)
 {
-    struct shiplook *s, *s2;
-
-    s = head;
-    if (s->uid == -1) {
-       s->uid = uid;
-       s->looked = 0;
-       s->found = 1;
-       s->next = (struct shiplook *)0;
-    }
+    struct shiplist *s, *s2;
 
+    s = *head;
 
-    while (s != ((struct shiplook *)0)) {
-       if (s->uid == uid) {
-           s->found = 1;
-           return;
-       }
+    while (s != NULL) {
        s2 = s;
        s = s->next;
+       free(s2);
     }
-
-    s = (struct shiplook *)malloc(sizeof(struct shiplook));
-    memset(s, 0, sizeof(struct shiplook));
-    s2->next = s;
-    s->uid = uid;
-    s->found = 1;
-    s->next = (struct shiplook *)0;
+    *head = NULL;
 }
 
-int
-print_found(struct shiplook *head)
+void
+print_shiplist(struct shiplist *head)
 {
-    struct shiplook *s;
+    struct shiplist *s;
     int first;
-    struct mchrstr *mp;
     struct shpstr ship;
 
     s = head;
     first = 1;
-    if (s->uid == -1)
-       return 0;
 
-    while (s != ((struct shiplook *)0)) {
+    while (s != NULL) {
        getship(s->uid, &ship);
-       mp = &mchr[(int)ship.shp_type];
        if (first) {
            pr(" #          player->owner           eff        type\n");
            first = 0;
@@ -167,6 +113,4 @@ print_found(struct shiplook *head)
           cname(ship.shp_own), effadv(ship.shp_effic), prship(&ship));
        s = s->next;
     }
-
-    return 1;
 }