Fix trailing whitespace

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

diff --git a/src/lib/subs/list.c b/src/lib/subs/list.c
index 8d13262e5da2a4c23a0b68242f319aac9a8dfda9..e91dc2796a45077f899b61b966f4bb9be3e36edc 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-2006, 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
@@ -26,7 +26,7 @@
  *  ---
  *
  *  list.c: List ships, planes, units at a given x,y
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1986
  */
@@ -39,14 +39,16 @@
 #include "misc.h"
 #include "nat.h"
 #include "nsc.h"
+#include "path.h"
 #include "plane.h"
 #include "player.h"
 #include "prototypes.h"
+#include "sect.h"
 #include "ship.h"
 #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;
@@ -71,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;
@@ -85,12 +89,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 +105,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;
@@ -170,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;
@@ -185,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) {
@@ -255,30 +247,39 @@ asw_shipsatxy(coord x, coord y, int wantflags, int nowantflags,
 }
 
 int
-num_shipsatxy(coord x, coord y, int wantflags, int nowantflags)
+adj_units(coord x, coord y, natid own)
 {
-    int ships;
-    struct nstr_item ni;
-    struct mchrstr *mp;
-    struct shpstr ship;
+    int i;
+    struct sctstr sect;
 
-    ships = 0;
-    snxtitem_xy(&ni, EF_SHIP, x, y);
-    while (nxtitem(&ni, &ship)) {
-       if (ship.shp_effic < SHIP_MINEFF || ship.shp_own == 0)
+    for (i = DIR_FIRST; i <= DIR_LAST; i++) {
+       getsect(x + diroff[i][0], y + diroff[i][1], &sect);
+       if (has_units(sect.sct_x, sect.sct_y, own, 0))
+           return 1;
+    }
+    return 0;
+}
+
+int
+has_units(coord x, coord y, natid cn, struct lndstr *lp)
+{
+    int n;
+    struct lndstr land;
+
+    for (n = 0; ef_read(EF_LAND, n, &land); n++) {
+       if (land.lnd_x != x || land.lnd_y != y)
            continue;
-       mp = &mchr[(int)ship.shp_type];
-       if (wantflags) {
-           if ((mp->m_flags & wantflags) == 0)
-               continue;
-       }
-       if (nowantflags) {
-           if (mp->m_flags & nowantflags)
+       if (lp) {
+           /* Check this unit.  If it is this one, we don't want
+              it included in the count. */
+           if (lp->lnd_uid == land.lnd_uid)
                continue;
        }
-       ships++;
+       if (land.lnd_own == cn)
+           return 1;
     }
-    return ships;
+
+    return 0;
 }
 
 /*