From 1d88b8783a474afadbd35abec1b4a02de1073caf Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 30 Sep 2005 20:44:43 +0000 Subject: [PATCH] (plist): Member state is used write-only, remove. (P_OK, P_FIRED, P_DEL): Unused, remove. --- include/plane.h | 5 ----- src/lib/subs/aircombat.c | 1 - src/lib/subs/mslsub.c | 1 - src/lib/subs/plnsub.c | 1 - 4 files changed, 8 deletions(-) diff --git a/include/plane.h b/include/plane.h index fb0eeabe..eb0f9673 100644 --- a/include/plane.h +++ b/include/plane.h @@ -129,17 +129,12 @@ struct plchrstr { struct plist { struct emp_qelem queue; /* list of planes */ - int state; /* state of plane */ int bombs; /* bombs carried for bombing mission */ int misc; /* amount of random item being transported */ struct plchrstr *pcp; /* pointer to desc of plane */ struct plnstr plane; /* struct plane */ }; -#define P_OK 0 -#define P_FIRED 1 -#define P_DEL 2 - #define getplane(n, p) \ ef_read(EF_PLANE, n, p) #define putplane(n, p) \ diff --git a/src/lib/subs/aircombat.c b/src/lib/subs/aircombat.c index 606fadd9..bbb0ba4d 100644 --- a/src/lib/subs/aircombat.c +++ b/src/lib/subs/aircombat.c @@ -1077,7 +1077,6 @@ getilist(struct emp_qelem *list, natid own, struct emp_qelem *a, continue; /* got one! */ ip = malloc(sizeof(*ip)); - ip->state = P_OK; ip->bombs = 0; ip->misc = 0; ip->pcp = &plchr[(int)plane.pln_type]; diff --git a/src/lib/subs/mslsub.c b/src/lib/subs/mslsub.c index da3387e5..084d77e5 100644 --- a/src/lib/subs/mslsub.c +++ b/src/lib/subs/mslsub.c @@ -199,7 +199,6 @@ msl_sel(struct emp_qelem *list, coord x, coord y, natid victim, continue; /* got a valid interceptor */ irv = malloc(sizeof(*irv)); - irv->state = P_OK; irv->bombs = 0; irv->misc = 0; irv->pcp = &plchr[(int)plane.pln_type]; diff --git a/src/lib/subs/plnsub.c b/src/lib/subs/plnsub.c index 14919703..cfb91756 100644 --- a/src/lib/subs/plnsub.c +++ b/src/lib/subs/plnsub.c @@ -504,7 +504,6 @@ pln_sel(struct nstr_item *ni, struct emp_qelem *list, struct sctstr *ap, plane.pln_mission = 0; putplane(plane.pln_uid, &plane); plp = malloc(sizeof(struct plist)); - plp->state = P_OK; plp->misc = 0; plp->bombs = 0; plp->pcp = pcp;