Streamline plist initialization

msl_equip(), find_escorts() and perform_mission() memset() the plist,
then assign to all members but load.  Just zero load instead, like
getilists(), msl_sel() and pln_sel() do.

diff --git a/src/lib/commands/laun.c b/src/lib/commands/laun.c
index b5fd9db11397488ea8afa2c69063d4bcbf52237d..8f6b58f016f284e8bac5c43917525c20a90076c0 100644 (file)
--- a/src/lib/commands/laun.c
+++ b/src/lib/commands/laun.c
@@ -354,7 +354,7 @@ msl_equip(struct plnstr *pp, char mission)
 {
     struct plist pl;
 
-    memset(&pl, 0, sizeof(struct plist));
+    pl.load = 0;
     pl.pcp = plchr + pp->pln_type;
     pl.plane = *pp;
     emp_initque(&pl.queue);

diff --git a/src/lib/subs/mission.c b/src/lib/subs/mission.c
index 9a23a2bf806a8d84a789f4c530d846f922730f02..75fe7c1a214ef849e6f982207003e2e59b082b0d 100644 (file)
--- a/src/lib/subs/mission.c
+++ b/src/lib/subs/mission.c
@@ -329,7 +329,7 @@ find_escorts(coord x, coord y, natid cn, struct emp_qelem *escorts)
        if (!in_oparea((struct empobj *)&plane, x, y))
            continue;
        plp = malloc(sizeof(struct plist));
-       memset(plp, 0, sizeof(struct plist));
+       plp->load = 0;
        plp->pcp = &plchr[(int)plane.pln_type];
        plp->plane = plane;
        emp_insque(&plp->queue, escorts);
@@ -371,8 +371,7 @@ perform_mission(coord x, coord y, natid victim, struct emp_qelem *list,
            else {
                /* save planes for later */
                plp = malloc(sizeof(struct plist));
-
-               memset(plp, 0, sizeof(struct plist));
+               plp->load = 0;
                plp->pcp = pcp;
                memcpy(&plp->plane, glp->thing, sizeof(struct plnstr));
                if (plp->pcp->pl_flags & P_M)