(pln_arm): Callers don't use parameter tech; remove it. Callers

changed.

include/prototypes.h

@@ -396,7 +396,7 @@ extern void pln_mine(struct emp_qelem *list, struct sctstr *sectp);
 extern void pln_sel(struct nstr_item *, struct emp_qelem *,
 		    struct sctstr *, int, int, int, int);
 extern int pln_arm(struct emp_qelem *, int, int, struct ichrstr *,
-		   int, int, int *);
+		   int, int);
 extern int pln_mobcost(int, struct plnstr *, int);
 extern void pln_put(struct emp_qelem *);
 extern void pln_removedupes(struct emp_qelem *, struct emp_qelem *);

src/lib/commands/bomb.c

@@ -88,7 +88,6 @@ bomb(void)
 {
     s_char *p;
     int mission_flags;
-    int tech;
     coord tx, ty;
     coord ax, ay;
     int ap_to_target;
@@ -154,22 +153,17 @@ bomb(void)
 	    2, wantflags | P_F | P_ESC, P_M | P_O);
     /*
      * now arm and equip the bombers, transports, whatever.
-     * tech is stored in high 16 bits of mission_flags.
-     * yuck.
      */
-    tech = 0;
     mission_flags |= P_X;	/* stealth (shhh) */
     mission_flags |= P_H;	/* gets turned off if not all choppers */
-    mission_flags =
+    mission_flags = pln_arm(&bomb_list, 2 * ap_to_target, mission,
-	pln_arm(&bomb_list, 2 * ap_to_target, mission, ip, 0,
+			    ip, 0, mission_flags);
-		mission_flags, &tech);
     if (QEMPTY(&bomb_list)) {
 	pr("No planes could be equipped for the mission.\n");
 	return RET_FAIL;
     }
-    mission_flags =
+    mission_flags = pln_arm(&esc_list, 2 * ap_to_target, mission,
-	pln_arm(&esc_list, 2 * ap_to_target, mission, ip, P_F | P_ESC,
+			    ip, P_F | P_ESC, mission_flags);
-		mission_flags, &tech);
     ac_encounter(&bomb_list, &esc_list, ax, ay, flightpath, mission_flags,
 		 0, 0, 0);
     if (QEMPTY(&bomb_list)) {

src/lib/commands/drop.c

@@ -52,7 +52,6 @@ drop(void)
 {
     s_char *p;
     int mission_flags;
-    int tech;
     coord tx, ty;
     coord ax, ay;
     int ap_to_target;
@@ -130,21 +129,18 @@ drop(void)
 	    2, P_ESC | P_F, P_M | P_O);
     /*
      * now arm and equip the bombers, transports, whatever.
-     * tech is stored in high 16 bits of mission_flags.
-     * yuck.
      */
-    tech = 0;
     mission_flags |= P_X;	/* stealth (shhh) */
     mission_flags |= P_H;	/* gets turned off if not all choppers */
     mission_flags |= P_MINE;
     mission_flags = pln_arm(&bomb_list, 2 * ap_to_target, 'd',
-			    ip, 0, mission_flags, &tech);
+			    ip, 0, mission_flags);
     if (QEMPTY(&bomb_list)) {
 	pr("No planes could be equipped for the mission.\n");
 	return RET_FAIL;
     }
     mission_flags = pln_arm(&esc_list, 2 * ap_to_target, 'd',
-			    ip, P_ESC | P_F, mission_flags, &tech);
+			    ip, P_ESC | P_F, mission_flags);
     ac_encounter(&bomb_list, &esc_list, ax, ay, flightpath, mission_flags,
 		 0, 0, 0);
     if (QEMPTY(&bomb_list)) {

src/lib/commands/fly.c

@@ -53,7 +53,6 @@ fly(void)
 {
     s_char *p;
     int mission_flags;
-    int tech;
     coord tx, ty;
     coord ax, ay;
     int ap_to_target;
@@ -142,20 +141,17 @@ fly(void)
     }
     /*
      * now arm and equip the bombers, transports, whatever.
-     * tech is stored in high 16 bits of mission_flags.
-     * yuck.
      */
-    tech = 0;
     mission_flags |= P_X;	/* stealth (shhh) */
     mission_flags |= P_H;	/* gets turned off if not all choppers */
     mission_flags = pln_arm(&bomb_list, ap_to_target, 't',
-			    ip, 0, mission_flags, &tech);
+			    ip, 0, mission_flags);
     if (QEMPTY(&bomb_list)) {
 	pr("No planes could be equipped for the mission.\n");
 	return RET_FAIL;
     }
     mission_flags = pln_arm(&esc_list, ap_to_target, 't',
-			    ip, P_ESC | P_F, mission_flags, &tech);
+			    ip, P_ESC | P_F, mission_flags);
     ac_encounter(&bomb_list, &esc_list, ax, ay, flightpath, mission_flags,
 		 0, 0, 0);
     if (QEMPTY(&bomb_list)) {

src/lib/commands/para.c

@@ -59,7 +59,6 @@ para(void)
 {
     s_char *p;
     int mission_flags;
-    int tech;
     coord tx, ty;
     coord ax, ay;
     int ap_to_target;
@@ -113,23 +112,18 @@ para(void)
 	    2, P_ESC | P_F, P_M | P_O);
     /*
      * now arm and equip the bombers, transports, whatever.
-     * tech is stored in high 16 bits of mission_flags.
-     * yuck.
      */
-    tech = 0;
     mission_flags = 0;
     mission_flags |= P_X;	/* stealth (shhh) */
     mission_flags |= P_H;	/* gets turned off if not all choppers */
-    mission_flags =
+    mission_flags = pln_arm(&bomb_list, 2 * ap_to_target, 'a',
-	pln_arm(&bomb_list, 2 * ap_to_target, 'a', &ichr[I_MILIT], 0,
+			    &ichr[I_MILIT], 0, mission_flags);
-		mission_flags, &tech);
     if (QEMPTY(&bomb_list)) {
 	pr("No planes could be equipped for the mission.\n");
 	return RET_FAIL;
     }
-    mission_flags =
+    mission_flags = pln_arm(&esc_list, 2 * ap_to_target, 'a',
-	pln_arm(&esc_list, 2 * ap_to_target, 'a', &ichr[I_MILIT],
+			    &ichr[I_MILIT], P_ESC | P_F, mission_flags);
-		P_ESC | P_F, mission_flags, &tech);
     ac_encounter(&bomb_list, &esc_list, ax, ay, flightpath, mission_flags,
 		 0, 0, 0);
     if (QEMPTY(&bomb_list)) {

src/lib/commands/reco.c

@@ -52,7 +52,6 @@ reco(void)
 {
     s_char *p;
     int mission_flags;
-    int tech;
     coord tx, ty;
     coord ax, ay;
     int ap_to_target;
@@ -122,20 +121,17 @@ reco(void)
     /*
      * now arm and equip the bombers, transports, whatever.
      */
-    tech = 0;
     mission_flags |= P_X;	/* stealth (shhh) */
     mission_flags |= P_H;	/* gets turned off if not all choppers */
     mission_flags |= P_A;
-    mission_flags =
+    mission_flags = pln_arm(&bomb_list, ap_to_target, 'r',
-	pln_arm(&bomb_list, ap_to_target, 'r', 0, P_S | P_I, mission_flags,
+			    0, P_S | P_I, mission_flags);
-		&tech);
     if (QEMPTY(&bomb_list)) {
 	pr("No planes could be equipped for the mission.\n");
 	return RET_FAIL;
     }
-    mission_flags =
+    mission_flags = pln_arm(&esc_list, ap_to_target, 'r',
-	pln_arm(&esc_list, ap_to_target, 'r', 0, P_F, mission_flags,
+			    0, P_F, mission_flags);
-		&tech);
     mission_flags |= PM_R;
 
     if (*player->argp[0] == 's')

src/lib/subs/plnsub.c

@@ -518,14 +518,12 @@ pln_sel(struct nstr_item *ni, struct emp_qelem *list, struct sctstr *ap,
 
 int
 pln_arm(struct emp_qelem *list, int dist, int mission, struct ichrstr *ip,
-	int flags, int mission_flags, int *tech)
+	int flags, int mission_flags)
 {
     struct emp_qelem *qp;
     struct emp_qelem *next;
     struct plist *plp;
 
-    if (*tech == 0)
-	*tech = 9999;
     for (qp = list->q_forw; qp != list; qp = next) {
 	next = qp->q_forw;
 	plp = (struct plist *)qp;
@@ -540,8 +538,6 @@ pln_arm(struct emp_qelem *list, int dist, int mission, struct ichrstr *ip,
 	    if (plp->pcp->pl_flags & P_I)
 		mission_flags |= P_I;
 	}
-	if (*tech > plp->plane.pln_tech)
-	    *tech = plp->plane.pln_tech;
 	if (!(plp->pcp->pl_flags & P_H))
 	    /* no stealth on this mission */
 	    mission_flags &= ~P_H;