Fix trailing whitespace

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

diff --git a/src/lib/subs/list.c b/src/lib/subs/list.c
index 96ce5d2da91e2f9f33a80e5c60d715ae6fb5f3ff..e91dc2796a45077f899b61b966f4bb9be3e36edc 100644 (file)
--- a/src/lib/subs/list.c
+++ b/src/lib/subs/list.c
@@ -26,7 +26,7 @@
  *  ---
  *
  *  list.c: List ships, planes, units at a given x,y
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1986
  */
@@ -48,7 +48,7 @@
 #include "xy.h"
 
 int
-shipsatxy(coord x, coord y, int wantflags, int nowantflags)
+shipsatxy(coord x, coord y, int wantflags, int nowantflags, int only_count)
 {
     int first;
     int ships;
@@ -73,12 +73,14 @@ shipsatxy(coord x, coord y, int wantflags, int nowantflags)
            if (mp->m_flags & nowantflags)
                continue;
        }
-       if (first) {
-           pr(" #          owner           eff       type\n");
-           first = 0;
+       if (!only_count) {
+           if (first) {
+               pr(" #          owner           eff       type\n");
+               first = 0;
+           }
+           pr("(#%3d) %10.10s  %12.12s  %s\n", ni.cur,
+              cname(ship.shp_own), effadv(ship.shp_effic), prship(&ship));
        }
-       pr("(#%3d) %10.10s  %12.12s  %s\n", ni.cur,
-          cname(ship.shp_own), effadv(ship.shp_effic), prship(&ship));
        ships++;
     }
     return ships;
@@ -162,8 +164,7 @@ unitsatxy(coord x, coord y, int wantflags, int nowantflags)
 }
 
 int
-planesatxy(coord x, coord y, int wantflags, int nowantflags,
-          struct emp_qelem *list)
+planesatxy(coord x, coord y, int wantflags, int nowantflags)
 {
     int first;
     int planes;
@@ -177,10 +178,9 @@ planesatxy(coord x, coord y, int wantflags, int nowantflags,
     while (nxtitem(&ni, &plane)) {
        if (plane.pln_effic < PLANE_MINEFF || plane.pln_own == 0)
            continue;
-       if (plane.pln_flags & PLN_LAUNCHED)
+       if (plane.pln_ship >= 0 || plane.pln_land >= 0)
            continue;
-       /* Is this plane one of the ones flying somewhere? */
-       if (ac_isflying(&plane, list))
+       if (plane.pln_flags & PLN_LAUNCHED)
            continue;
        plp = &plchr[(int)plane.pln_type];
        if (first) {
@@ -246,33 +246,6 @@ asw_shipsatxy(coord x, coord y, int wantflags, int nowantflags,
     return ships;
 }
 
-int
-num_shipsatxy(coord x, coord y, int wantflags, int nowantflags)
-{
-    int ships;
-    struct nstr_item ni;
-    struct mchrstr *mp;
-    struct shpstr ship;
-
-    ships = 0;
-    snxtitem_xy(&ni, EF_SHIP, x, y);
-    while (nxtitem(&ni, &ship)) {
-       if (ship.shp_effic < SHIP_MINEFF || ship.shp_own == 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;
-       }
-       ships++;
-    }
-    return ships;
-}
-
 int
 adj_units(coord x, coord y, natid own)
 {