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

(pln_wanted, pln_capable): Rename.

Browse source
This commit is contained in:
Markus Armbruster 2007-11-02 19:13:10 +00:00
parent 98105c9561
commit 4d663ddbd6
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/prototypes.h
View file

@ -556,7 +556,7 @@ extern int put_plane_on_ship(struct plnstr *, struct shpstr *);
extern void pln_dropoff(struct emp_qelem *, struct ichrstr *, extern void pln_dropoff(struct emp_qelem *, struct ichrstr *,
coord, coord, void *, int); coord, coord, void *, int);
extern void pln_mine(struct emp_qelem *list, struct sctstr *sectp); extern void pln_mine(struct emp_qelem *list, struct sctstr *sectp);
extern int pln_wanted(struct plnstr *, int, int); extern int pln_capable(struct plnstr *, int, int);
extern void pln_sel(struct nstr_item *, struct emp_qelem *, extern void pln_sel(struct nstr_item *, struct emp_qelem *,
struct sctstr *, int, int, int, int); struct sctstr *, int, int, int, int);
extern int pln_arm(struct emp_qelem *, int, char, struct ichrstr *, extern int pln_arm(struct emp_qelem *, int, char, struct ichrstr *,

2
src/lib/subs/mission.c
View file

@ -946,7 +946,7 @@ mission_pln_sel(struct emp_qelem *list, int wantflags, int nowantflags,
} }
} }
if (!pln_wanted(pp, wantflags, nowantflags)) { if (!pln_capable(pp, wantflags, nowantflags)) {
emp_remque(qp); emp_remque(qp);
free(qp); free(qp);
continue; continue;

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

@ -352,15 +352,15 @@ pln_mine(struct emp_qelem *list, struct sctstr *sectp)
} }
/* /*
* Is a plane of PP's type wanted? * Has PP's type capabilities satisfying WANTFLAGS and NOWANTFLAGS?
* A plane type is wanted unless * A plane type is capable unless
* - it lacks all of the P_F, P_ESC in wantflags, or * - it lacks all of the P_F, P_ESC in WANTFLAGS, or
* - it lacks all of the P_E, P_L, P_K in wantflags, or * - it lacks all of the P_E, P_L, P_K in WANTFLAGS, or
* - it lacks any of the other flags in wantflags, or * - it lacks any of the other capabilities in WANTFLAGS, or
* - it has any of the flags in nowantflags. * - it has any of the capabilities in NOWANTFLAGS.
*/ */
int int
pln_wanted(struct plnstr *pp, int wantflags, int nowantflags) pln_capable(struct plnstr *pp, int wantflags, int nowantflags)
{ {
int flags = plchr[(int)pp->pln_type].pl_flags; int flags = plchr[(int)pp->pln_type].pl_flags;
@ -427,7 +427,7 @@ pln_sel(struct nstr_item *ni, struct emp_qelem *list, struct sctstr *ap,
range += ap_to_target; range += ap_to_target;
range *= rangemult; range *= rangemult;
pcp = &plchr[(int)plane.pln_type]; pcp = &plchr[(int)plane.pln_type];
if (!pln_wanted(&plane, wantflags, nowantflags)) if (!pln_capable(&plane, wantflags, nowantflags))
continue; continue;
if (plane.pln_range < range) { if (plane.pln_range < range) {
pr("%s out of range (%d:%d)\n", pr("%s out of range (%d:%d)\n",