Get rid of src/lib/common/land.c

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

diff --git a/src/lib/subs/list.c b/src/lib/subs/list.c
index 4c46460e349ee688fd998e654245c69b8ed1818d..96ce5d2da91e2f9f33a80e5c60d715ae6fb5f3ff 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-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,9 +19,9 @@
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
@@ -31,21 +31,21 @@
  *     Dave Pare, 1986
  */
 
-#include "misc.h"
-#include "player.h"
-#include "var.h"
-#include "news.h"
-#include "ship.h"
+#include <config.h>
+
+#include <ctype.h>
+#include "file.h"
 #include "land.h"
-#include "sect.h"
-#include "nuke.h"
-#include "plane.h"
+#include "misc.h"
 #include "nat.h"
-#include "item.h"
-#include "xy.h"
 #include "nsc.h"
-#include "file.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)
@@ -59,7 +59,7 @@ shipsatxy(coord x, coord y, int wantflags, int nowantflags)
     first = 1;
     ships = 0;
     snxtitem_xy(&ni, EF_SHIP, x, y);
-    while (nxtitem(&ni, (s_char *)&ship)) {
+    while (nxtitem(&ni, &ship)) {
        if (player->owner)
            continue;
        if (ship.shp_effic < SHIP_MINEFF || ship.shp_own == 0)
@@ -87,33 +87,24 @@ 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;
-    int allied;
 
     first = 1;
     ships = 0;
     snxtitem_xy(&ni, EF_SHIP, x, y);
-    while (nxtitem(&ni, (s_char *)&ship)) {
+    while (nxtitem(&ni, &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 ((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;
@@ -137,7 +128,7 @@ unitsatxy(coord x, coord y, int wantflags, int nowantflags)
     first = 1;
     units = 0;
     snxtitem_xy(&ni, EF_LAND, x, y);
-    while (nxtitem(&ni, (s_char *)&land)) {
+    while (nxtitem(&ni, &land)) {
        if (land.lnd_effic < LAND_MINEFF || land.lnd_own == 0)
            continue;
        /* Can't bomb units on ships or other units */
@@ -183,7 +174,7 @@ planesatxy(coord x, coord y, int wantflags, int nowantflags,
     planes = 0;
     first = 1;
     snxtitem_xy(&ni, EF_PLANE, x, y);
-    while (nxtitem(&ni, (s_char *)&plane)) {
+    while (nxtitem(&ni, &plane)) {
        if (plane.pln_effic < PLANE_MINEFF || plane.pln_own == 0)
            continue;
        if (plane.pln_flags & PLN_LAUNCHED)
@@ -213,7 +204,7 @@ planesatxy(coord x, coord y, int wantflags, int nowantflags,
 
 int
 asw_shipsatxy(coord x, coord y, int wantflags, int nowantflags,
-             struct plnstr *pp, struct shiplook *head)
+             struct plnstr *pp, struct shiplist **head)
 {
     int first;
     int ships;
@@ -224,7 +215,7 @@ asw_shipsatxy(coord x, coord y, int wantflags, int nowantflags,
     first = 1;
     ships = 0;
     snxtitem_xy(&ni, EF_SHIP, x, y);
-    while (nxtitem(&ni, (s_char *)&ship)) {
+    while (nxtitem(&ni, &ship)) {
        if (player->owner)
            continue;
        if (ship.shp_effic < SHIP_MINEFF || ship.shp_own == 0)
@@ -243,7 +234,7 @@ asw_shipsatxy(coord x, coord y, int wantflags, int nowantflags,
                                          shp_hardtarget(&ship), EF_SHIP))
                continue;
        }
-       set_have_found(ship.shp_uid, head);
+       add_shiplist(ship.shp_uid, head);
        if (first) {
            pr(" #          owner           eff       type\n");
            first = 0;
@@ -265,7 +256,7 @@ num_shipsatxy(coord x, coord y, int wantflags, int nowantflags)
 
     ships = 0;
     snxtitem_xy(&ni, EF_SHIP, x, y);
-    while (nxtitem(&ni, (s_char *)&ship)) {
+    while (nxtitem(&ni, &ship)) {
        if (ship.shp_effic < SHIP_MINEFF || ship.shp_own == 0)
            continue;
        mp = &mchr[(int)ship.shp_type];
@@ -282,24 +273,52 @@ num_shipsatxy(coord x, coord y, int wantflags, int nowantflags)
     return ships;
 }
 
+int
+adj_units(coord x, coord y, natid own)
+{
+    int i;
+    struct sctstr sect;
+
+    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;
+       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;
+       }
+       if (land.lnd_own == cn)
+           return 1;
+    }
+
+    return 0;
+}
+
 /*
  * is p a list of ships/planes/units?
- *
  */
 
 int
-islist(s_char *p)
+islist(char *p)
 {
-    register int x;
-
-    x = 0;
-
-    while (*(p + x)) {
-       if (!isdigit(*(p + x)) && (*(p + x) != '/'))
+    for (; *p; p++) {
+       if (!isdigit(*p) && *p != '/')
            return 0;
-
-       x++;
     }
-
     return 1;
 }