/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure
*
* This program is free software; you can redistribute it and/or modify
*
* ---
*
- * 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.
*
* ---
*
* 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 "plane.h"
+#include "player.h"
#include "prototypes.h"
+#include "ship.h"
+#include "xy.h"
int
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)
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 (ship.shp_effic < SHP_AIROPS_EFF)
continue;
mp = &mchr[(int)ship.shp_type];
if (wantflags) {
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 */
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)
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;
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)
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;
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];
/*
* 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;
}