Update copyright notice

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

diff --git a/src/lib/subs/list.c b/src/lib/subs/list.c
index f2a45aa7b194dbc12c8266b6fec45f4b29dd07c4..0aa111ddd0453afeafc2e8a528b6d3e57cfd3e7f 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-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -85,12 +85,11 @@ shipsatxy(coord x, coord y, int wantflags, int nowantflags)
 /* This one only shows owned or allied ships */
 
 int
-carriersatxy(coord x, coord y, int wantflags, int nowantflags, natid own)
+carriersatxy(coord x, coord y, natid own)
 {
     int first;
     int ships;
     struct nstr_item ni;
-    struct mchrstr *mp;
     struct shpstr ship;
 
     first = 1;
@@ -102,17 +101,8 @@ carriersatxy(coord x, coord y, int wantflags, int nowantflags, natid own)
        if (ship.shp_own != own
            && getrel(getnatp(ship.shp_own), own) != ALLIED)
            continue;
-       if (ship.shp_effic < SHP_AIROPS_EFF)
+       if ((carrier_planes(&ship, 0) & (P_L | P_K)) == 0)
            continue;
-       mp = &mchr[(int)ship.shp_type];
-       if (wantflags) {
-           if ((mp->m_flags & wantflags) == 0)
-               continue;
-       }
-       if (nowantflags) {
-           if (mp->m_flags & nowantflags)
-               continue;
-       }
        if (first) {
            pr(" #          owner           eff       type\n");
            first = 0;