Update copyright notice.

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

diff --git a/src/lib/subs/list.c b/src/lib/subs/list.c
index 6e6728f2d8e913f135fe33fd5e4f80db1e922273..be7288d2ac028a15c6a883c1868ac3703942e579 100644 (file)
--- a/src/lib/subs/list.c
+++ b/src/lib/subs/list.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-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -94,7 +94,6 @@ carriersatxy(coord x, coord y, int wantflags, int nowantflags, natid own)
     struct nstr_item ni;
     struct mchrstr *mp;
     struct shpstr ship;
-    int allied;
 
     first = 1;
     ships = 0;
@@ -102,8 +101,10 @@ carriersatxy(coord x, coord y, int wantflags, int nowantflags, natid own)
     while (nxtitem(&ni, (s_char *)&ship)) {
        if (ship.shp_effic < SHIP_MINEFF || ship.shp_own == 0)
            continue;
-       allied = (getrel(getnatp(ship.shp_own), own) == ALLIED);
-       if ((ship.shp_own != own) && !allied)
+       if (ship.shp_own != own
+           && getrel(getnatp(ship.shp_own), own) != ALLIED)
+           continue;
+       if (ship.shp_effic < SHP_AIROPS_EFF)
            continue;
        mp = &mchr[(int)ship.shp_type];
        if (wantflags) {