empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(carriersatxy): Remove parameters wantflags, nowantflags, and use

Browse source 
carrier_planes() instead, ignoring carriers that can only operate
x-light planes.  No functional change.
(carrier_planes): External linkage.
This commit is contained in:
Markus Armbruster 2007-11-04 16:05:06 +00:00
parent d5afd757a9
commit 6992bcfe9a
3 changed files with 6 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/lib/subs/plnsub.c
View file

@ -55,7 +55,6 @@
#include "ship.h"
#include "xy.h"
static int carrier_planes(struct shpstr *);
static int pln_equip(struct plist *, struct ichrstr *, int, char);
static int fit_plane_on_ship(struct plnstr *, struct shpstr *);
@ -113,8 +112,7 @@ pln_onewaymission(struct sctstr *target, int *shipno, int *flagp)
flags = *flagp;
/* offer carriers */
nships = carriersatxy(target->sct_x, target->sct_y,
M_FLY | M_CHOPPER, 0, player->cnum);
nships = carriersatxy(target->sct_x, target->sct_y, player->cnum);
if (nships) {
for (;;) {
if (!(p = getstarg(0, "Carrier #? ", buf)) || !*p)
@ -384,7 +382,7 @@ pln_capable(struct plnstr *pp, int wantflags, int nowantflags)
* It's zero if SP can't support air operations due to its type or
* state (low efficiency).
*/
static int
int
carrier_planes(struct shpstr *sp)
{
struct mchrstr *mcp = mchr + sp->shp_type;