Consistently use int for mission type parameters

[empserver] / src / lib / subs / mission.c

diff --git a/src/lib/subs/mission.c b/src/lib/subs/mission.c
index b6188472531179a23eee32aba51109f772fd266d..cef5c47b854f0d118dfeb19f259032fe46985110 100644 (file)
--- a/src/lib/subs/mission.c
+++ b/src/lib/subs/mission.c
@@ -389,7 +389,7 @@ perform_mission(coord x, coord y, natid victim, struct emp_qelem *list,
     struct plchrstr *pcp;
     int dam = 0, dam2;
     natid plane_owner = 0;
-    int md, range, air_dam;
+    int md, range, air_dam, sublaunch;
     double hitchance, vrange;
     int targeting_ships = *s == 's'; /* "subs" or "ships" FIXME gross! */
 
@@ -548,28 +548,29 @@ perform_mission(coord x, coord y, natid victim, struct emp_qelem *list,
        }
     }
 
+    /*
+     * Missiles, except for interdiction of ships or land units,
+     * because that happens elsewhere, in shp_missile_interdiction()
+     * and lnd_missile_interdiction().
+     */
     air_dam = 0;
     for (qp = missiles.q_back; qp != &missiles; qp = newqp) {
        newqp = qp->q_back;
        plp = (struct plist *)qp;
 
-       if (air_dam < 100 && mission_pln_equip(plp, NULL, 'p') >= 0) {
-           if (msl_hit(&plp->plane, hardtarget, EF_SECTOR,
-                       N_SCT_MISS, N_SCT_SMISS,
-                       "sector", x, y, victim)) {
-               dam2 = pln_damage(&plp->plane, 'p', 1);
-               air_dam += dam2;
-#if 0
-           /*
-            * FIXME want collateral damage on miss, but we get here
-            * too when launch fails or missile is intercepted
-            */
-           } else {
-               /* Missiles that miss have to hit somewhere! */
-               dam2 = pln_damage(&plp->plane, 'p', 0);
-               collateral_damage(x, y, dam2);
-#endif
-           }
+       if (air_dam < 100
+           && !CANT_HAPPEN(hardtarget != SECT_HARDTARGET
+                           || (plp->pcp->pl_flags & P_MAR))
+           && mission_pln_equip(plp, NULL, 'p') >= 0) {
+           if (msl_launch(&plp->plane, EF_SECTOR, "sector", x, y, victim,
+                          &sublaunch) < 0)
+               goto use_up_msl;
+           if (!msl_hit(&plp->plane, SECT_HARDTARGET, EF_SECTOR,
+                       N_SCT_MISS, N_SCT_SMISS, sublaunch, victim))
+               CANT_REACH();
+           dam2 = pln_damage(&plp->plane, 'p', 1);
+           air_dam += dam2;
+       use_up_msl:
            plp->plane.pln_effic = 0;
            putplane(plp->plane.pln_uid, &plp->plane);
        }
@@ -730,7 +731,7 @@ cando(int mission, int type)
 }
 
 char *
-mission_name(short mission)
+mission_name(int mission)
 {
     switch (mission) {
     case MI_INTERDICT: