(plist): Member state is used write-only, remove.

(P_OK, P_FIRED, P_DEL): Unused, remove.

diff --git a/include/plane.h b/include/plane.h
index fb0eeabe9067444de29542ddd05e335ae52404b3..eb0f9673268a0dce3694c51ba94b46fa40831153 100644 (file)
--- 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 606fadd95967565e15c7a16188677d7d0333ffb5..bbb0ba4da404d3b6253eb42f89dd2c9238ea7a62 100644 (file)
--- 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 da3387e53478e91433c5afaab125110d61bcaf71..084d77e5ec0223ff39590f8e74deb3f6f907f186 100644 (file)
--- 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 1491970373c0f114c3150211c319e3995a7bdc36..cfb9175674c71164516c86a2af2f4841a28b98bd 100644 (file)
--- 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;