/*
* 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
#include <config.h>
-#include "misc.h"
-#include "player.h"
-#include "ship.h"
+#include <ctype.h>
+#include "file.h"
#include "land.h"
-#include "plane.h"
+#include "misc.h"
#include "nat.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)
/* 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;
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;
/*
* is p a list of ships/planes/units?
- *
*/
int
-islist(s_char *p)
+islist(char *p)
{
- 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;
}