]> git.pond.sub.org Git - empserver/blobdiff - src/lib/commands/bomb.c
Remove redundant load checks before pln_damage()
[empserver] / src / lib / commands / bomb.c
index 806f30c755003d3cc8caa6ee2be17af226e941eb..850f0f1371cb4b89a81e37cca02ae3a15709e596 100644 (file)
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
  *  ---
  *
  *  bomb.c: Fly bombing missions
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1986
  *     Ken Stevens, 1995
  *     Steve McClure, 1998-2000
+ *     Markus Armbruster, 2004-2009
  */
 
 #include <config.h>
 #include "item.h"
 #include "land.h"
 #include "news.h"
+#include "nuke.h"
 #include "optlist.h"
 #include "path.h"
 #include "plane.h"
 #include "retreat.h"
 #include "ship.h"
 
-static void pin_bomb(struct emp_qelem *list, struct sctstr *target);
-static void strat_bomb(struct emp_qelem *list, struct sctstr *target);
-static void comm_bomb(struct emp_qelem *list, struct sctstr *target);
-static void eff_bomb(struct emp_qelem *list, struct sctstr *target);
-static int pinflak_planedamage(struct plnstr *pp, struct plchrstr *pcp,
-                              natid from, int flak);
-static void plane_bomb(struct emp_qelem *list, struct sctstr *target);
-static void land_bomb(struct emp_qelem *list, struct sctstr *target);
-static void ship_bomb(struct emp_qelem *list, struct sctstr *target);
+static void pin_bomb(struct emp_qelem *, struct sctstr *);
+static void eff_bomb(struct emp_qelem *, struct sctstr *);
+static void comm_bomb(struct emp_qelem *, struct sctstr *);
+static void ship_bomb(struct emp_qelem *, struct sctstr *);
+static void plane_bomb(struct emp_qelem *, struct sctstr *);
+static void land_bomb(struct emp_qelem *, struct sctstr *);
+static void strat_bomb(struct emp_qelem *, struct sctstr *);
+static int changed_plane_aborts(struct plist *);
+static int pinflak_planedamage(struct plnstr *, struct plchrstr *,
+                              natid, int);
 
 static i_type bombcomm[] = {
     I_CIVIL,
@@ -79,41 +82,36 @@ int
 bomb(void)
 {
     char *p;
-    int mission_flags;
     coord tx, ty;
     coord ax, ay;
     int ap_to_target;
-    struct ichrstr *ip;
     char flightpath[MAX_PATH_LEN];
     struct nstr_item ni_bomb;
     struct nstr_item ni_esc;
     struct sctstr target;
     struct emp_qelem bomb_list;
     struct emp_qelem esc_list;
-    int wantflags;
     struct sctstr ap_sect;
     char mission;
+    struct plist *plp;
+    struct emp_qelem *qp, *next;
     int rel;
     struct natstr *natp;
     char buf[1024];
 
-    wantflags = 0;
-    if (!snxtitem(&ni_bomb, EF_PLANE, player->argp[1]))
+    if (get_planes(&ni_bomb, &ni_esc, player->argp[1], player->argp[2]) < 0)
        return RET_SYN;
-    if (!snxtitem(&ni_esc, EF_PLANE,
-                 getstarg(player->argp[2], "escort(s)? ", buf)))
-       pr("No escorts...\n");
     p = getstarg(player->argp[3], "pinpoint, or strategic? ", buf);
-    if (!p)
+    if (!p || !*p)
        return RET_SYN;
     mission = *p;
-    if (strchr("ps", mission) == 0)
+    if (!strchr("ps", mission))
        return RET_SYN;
     if (!get_assembly_point(player->argp[4], &ap_sect, buf))
        return RET_SYN;
     ax = ap_sect.sct_x;
     ay = ap_sect.sct_y;
-    if (getpath(flightpath, player->argp[5], ax, ay, 0, 0, P_FLYING) == 0
+    if (!getpath(flightpath, player->argp[5], ax, ay, 0, 0, P_FLYING)
        || *flightpath == 0)
        return RET_SYN;
     tx = ax;
@@ -121,7 +119,6 @@ bomb(void)
     (void)pathtoxy(flightpath, &tx, &ty, fcost);
     pr("target sector is %s\n", xyas(tx, ty, player->cnum));
     getsect(tx, ty, &target);
-    ip = 0;
     ap_to_target = strlen(flightpath);
     if (flightpath[ap_to_target - 1] == 'h')
        ap_to_target--;
@@ -129,26 +126,20 @@ bomb(void)
     /*
      * select planes within range
      */
-    mission_flags = 0;
-    pln_sel(&ni_bomb, &bomb_list, &ap_sect, ap_to_target,
-           2, wantflags, P_M | P_O);
-    pln_sel(&ni_esc, &esc_list, &ap_sect, ap_to_target,
-           2, wantflags | P_F | P_ESC, P_M | P_O);
+    pln_sel(&ni_bomb, &bomb_list, &ap_sect, ap_to_target, 2,
+           P_B | P_T, P_M | P_O);
+    pln_sel(&ni_esc, &esc_list, &ap_sect, ap_to_target, 2,
+           P_ESC | P_F, P_M | P_O);
     /*
      * now arm and equip the bombers, transports, whatever.
      */
-    mission_flags |= P_X;      /* stealth (shhh) */
-    mission_flags |= P_H;      /* gets turned off if not all choppers */
-    mission_flags = pln_arm(&bomb_list, 2 * ap_to_target, mission,
-                           ip, 0, mission_flags);
+    pln_arm(&bomb_list, 2 * ap_to_target, mission, NULL);
     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, mission,
-                           ip, P_F | P_ESC, mission_flags);
-    ac_encounter(&bomb_list, &esc_list, ax, ay, flightpath, mission_flags,
-                0, 0, 0);
+    pln_arm(&esc_list, 2 * ap_to_target, 'e', NULL);
+    ac_encounter(&bomb_list, &esc_list, ax, ay, flightpath, 0);
     if (QEMPTY(&bomb_list)) {
        pr("No planes got through fighter defenses\n");
     } else if (target.sct_type == SCT_SANCT) {
@@ -157,6 +148,16 @@ bomb(void)
        switch (mission) {
        case 'p':
            pin_bomb(&bomb_list, &target);
+           for (qp = bomb_list.q_forw; qp != &bomb_list; qp = next) {
+               next = qp->q_forw;
+               plp = (struct plist *)qp;
+               changed_plane_aborts(plp);
+           }
+           for (qp = esc_list.q_forw; qp != &esc_list; qp = next) {
+               next = qp->q_forw;
+               plp = (struct plist *)qp;
+               changed_plane_aborts(plp);
+           }
            break;
        case 's':
            if (opt_SLOW_WAR) {
@@ -177,8 +178,7 @@ bomb(void)
            strat_bomb(&bomb_list, &target);
            break;
        default:
-           pr("Bad mission %c\n", mission);
-           break;
+           CANT_REACH();
        }
     }
     pln_put(&bomb_list);
@@ -195,7 +195,6 @@ pin_bomb(struct emp_qelem *list, struct sctstr *target)
     int type;
     int bad;
     char *p;
-    struct plist *plp;
     int nsubs;
     int nunits;
     struct natstr *natp;
@@ -209,23 +208,20 @@ pin_bomb(struct emp_qelem *list, struct sctstr *target)
     pr("Target sector is a %s constructed %s\n",
        effadv((int)target->sct_effic), dcp->d_name);
     nsubs = 0;
-    plp = (struct plist *)list->q_forw;
-    if (plp->pcp->pl_flags & P_A) {
-       nships = num_shipsatxy(target->sct_x, target->sct_y, 0, 0);
-       nsubs = nships - shipsatxy(target->sct_x, target->sct_y, 0, M_SUB);
+    nships = shipsatxy(target->sct_x, target->sct_y, 0, M_SUB, 0);
+    if (pln_caps(list) & P_A) {
+       nsubs = shipsatxy(target->sct_x, target->sct_y, M_SUB, 0, 1);
        if (nsubs > 0)
            pr("Some subs are present in the sector.\n");
-    } else {
-       nships = shipsatxy(target->sct_x, target->sct_y, 0, M_SUB);
     }
-    nplanes = planesatxy(target->sct_x, target->sct_y, 0, 0, list);
+    nplanes = planesatxy(target->sct_x, target->sct_y, 0, 0);
     nunits = unitsatxy(target->sct_x, target->sct_y, 0, 0);
   retry:
     p = getstring("Bomb what? (ship, plane, land unit, efficiency, commodities) ",
                  buf);
-    if (p == 0 || *p == 0) {
-       if (player->aborted)
-           return;
+    if (!p)
+       return;
+    if (!*p) {
        bad++;
        if (bad > 2)
            return;
@@ -272,7 +268,7 @@ pin_bomb(struct emp_qelem *list, struct sctstr *target)
        break;
     case 's':
        if (nships == 0) {
-           if (((struct plist *)list->q_forw)->pcp->pl_flags & P_A) {
+           if (pln_caps(list) & P_A) {
                if (nsubs == 0) {
                    pr("no ships there\n");
                    goto retry;
@@ -338,18 +334,18 @@ static void
 eff_bomb(struct emp_qelem *list, struct sctstr *target)
 {
     struct plist *plp;
-    struct emp_qelem *qp;
+    struct emp_qelem *qp, *next;
     struct sctstr sect;
     int oldeff, dam = 0;
     int nukedam;
 
-    for (qp = list->q_forw; qp != list; qp = qp->q_forw) {
+    for (qp = list->q_forw; qp != list; qp = next) {
+       next = qp->q_forw;
        plp = (struct plist *)qp;
-       if ((plp->pcp->pl_flags & P_C) && (!(plp->pcp->pl_flags & P_T)))
+       if (changed_plane_aborts(plp))
            continue;
-       if (plp->bombs || plp->plane.pln_nuketype != -1)
-           dam += pln_damage(&plp->plane, target->sct_x, target->sct_y,
-                             'p', &nukedam, 1);
+       dam += pln_damage(&plp->plane, target->sct_x, target->sct_y,
+                         'p', &nukedam, 1);
     }
     if (dam <= 0)              /* dam == 0 if only nukes were delivered */
        return;
@@ -369,16 +365,9 @@ eff_bomb(struct emp_qelem *list, struct sctstr *target)
           "%s bombing raid did %d%% damage in %s\n",
           cname(player->cnum), oldeff - target->sct_effic,
           xyas(target->sct_x, target->sct_y, target->sct_own));
-    if (target->sct_effic < SCT_MINEFF) {
-       if (target->sct_type == SCT_BSPAN)
-           knockdown(target, list);
-       else if (target->sct_type == SCT_BTOWER) {
-           knockdown(target, list);
-           bridgefall(target, list);
-       }
-    }
+    bridge_damaged(target);
     putsect(&sect);
-    collateral_damage(target->sct_x, target->sct_y, dam, list);
+    collateral_damage(target->sct_x, target->sct_y, dam);
 }
 
 static void
@@ -389,7 +378,7 @@ comm_bomb(struct emp_qelem *list, struct sctstr *target)
     int i;
     int amt, before;
     struct ichrstr *ip;
-    struct emp_qelem *qp;
+    struct emp_qelem *qp, *next;
     struct sctstr sect;
     int dam = 0;
     int nukedam;
@@ -427,13 +416,13 @@ comm_bomb(struct emp_qelem *list, struct sctstr *target)
        } else
            break;
     }
-    for (qp = list->q_forw; qp != list; qp = qp->q_forw) {
+    for (qp = list->q_forw; qp != list; qp = next) {
+       next = qp->q_forw;
        plp = (struct plist *)qp;
-       if ((plp->pcp->pl_flags & P_C) && (!(plp->pcp->pl_flags & P_T)))
+       if (changed_plane_aborts(plp))
            continue;
-       if (plp->bombs || plp->plane.pln_nuketype != -1)
-           dam += pln_damage(&plp->plane, target->sct_x, target->sct_y,
-                             'p', &nukedam, 1);
+       dam += pln_damage(&plp->plane, target->sct_x, target->sct_y,
+                         'p', &nukedam, 1);
     }
     if (dam <= 0)              /* dam == 0 if only nukes were delivered */
        return;
@@ -454,7 +443,7 @@ comm_bomb(struct emp_qelem *list, struct sctstr *target)
           cname(player->cnum), b, ip->i_name,
           xyas(target->sct_x, target->sct_y, target->sct_own));
     putsect(&sect);
-    collateral_damage(target->sct_x, target->sct_y, dam, list);
+    collateral_damage(target->sct_x, target->sct_y, dam);
 }
 
 static void
@@ -465,9 +454,8 @@ ship_bomb(struct emp_qelem *list, struct sctstr *target)
     int dam;
     char *q;
     int n;
-    struct emp_qelem *qp;
+    struct emp_qelem *qp, *next;
     int shipno;
-    int ignore;
     struct shpstr ship;
     int nships = 0;
     struct shiplist *head = NULL;
@@ -477,72 +465,60 @@ ship_bomb(struct emp_qelem *list, struct sctstr *target)
     int nukedam;
     int flak;
     int gun;
-    int shell;
 
-    for (qp = list->q_forw; qp != list && !player->aborted;
-        qp = qp->q_forw) {
+    for (qp = list->q_forw; qp != list; qp = next) {
+       next = qp->q_forw;
        free_shiplist(&head);
        plp = (struct plist *)qp;
-       if ((plp->pcp->pl_flags & P_C) && (!(plp->pcp->pl_flags & P_T)))
+       if (changed_plane_aborts(plp))
            continue;
        if (plp->pcp->pl_flags & P_A)
            nships = asw_shipsatxy(target->sct_x, target->sct_y, 0, 0,
                                   &plp->plane, &head);
        else
-           nships = shipsatxy(target->sct_x, target->sct_y, 0, M_SUB);
+           nships = shipsatxy(target->sct_x, target->sct_y, 0, M_SUB, 0);
        if (nships == 0) {
            pr("%s could not find any ships!\n", prplane(&plp->plane));
            continue;
        }
        (void)sprintf(prompt, "%s, %d bombs.  Target ('~' to skip)? ",
-                     prplane(&plp->plane), plp->bombs);
-       ignore = 0;
+                     prplane(&plp->plane), plp->load);
        shipno = -1;
-       while (shipno < 0 && !player->aborted && !ignore) {
-           if ((q = getstring(prompt, buf)) == 0 || *q == 0)
+       while (shipno < 0) {
+           if (!(q = getstring(prompt, buf)))
+               goto out;
+           if (*q == 0)
                continue;
-           if (*q == '~') {
-               ignore = 1;
-               continue;
-           }
+           if (*q == '~')
+               break;
            if (*q == '?') {
                if (plp->pcp->pl_flags & P_A)
                    print_shiplist(head);
                else
-                   shipsatxy(target->sct_x, target->sct_y, 0, M_SUB);
+                   shipsatxy(target->sct_x, target->sct_y, 0, M_SUB, 0);
                continue;
            }
-           if (*q == 'd')
-               goto next;
-           if (!isdigit(*q))
-               continue;
            n = atoi(q);
            if (n < 0)
                continue;
-           if ((plp->pcp->pl_flags & P_A) && !on_shiplist(n, head))
-               continue;
-           if (getship(n, &ship) && ship.shp_x == target->sct_x &&
-               ship.shp_y == target->sct_y)
+           if ((!(plp->pcp->pl_flags & P_A) || on_shiplist(n, head)) &&
+               getship(n, &ship) && ship.shp_own &&
+               ship.shp_x == target->sct_x && ship.shp_y == target->sct_y)
                shipno = n;
+           else
+               pr("Ship #%d not spotted\n", n);
        }
        if (shipno < 0)
            continue;
        if ((plp->pcp->pl_flags & P_A) && !on_shiplist(shipno, head))
            continue;
+       if (changed_plane_aborts(plp))
+           continue;
 
-       shell = gun = 0;
-       gun = MIN(ship.shp_item[I_GUN], ship.shp_glim);
-       if (gun > 0) {
-           shell = ship.shp_item[I_SHELL];
-           if (shell <= 0)
-               shell = supply_commod(ship.shp_own,
-                                     ship.shp_x, ship.shp_y, I_SHELL, 1);
-       }
+       gun = shp_usable_guns(&ship);
        mcp = &mchr[(int)ship.shp_type];
-       if (gun > 0 && shell > 0 && !(mcp->m_flags & M_SUB)) {
+       if (gun > 0 && !(mcp->m_flags & M_SUB)) {
            flak = (int)(techfact(ship.shp_tech, gun) * 2.0);
-           ship.shp_item[I_SHELL] = shell;
-           putship(ship.shp_uid, &ship);
            PR(ship.shp_own, "Flak! Firing %d guns from ship %s\n",
               flak, prship(&ship));
            if (pinflak_planedamage(&plp->plane, plp->pcp, ship.shp_own, flak))
@@ -550,7 +526,7 @@ ship_bomb(struct emp_qelem *list, struct sctstr *target)
        }
 
        dam = 0;
-       if (plp->plane.pln_nuketype != -1)
+       if (nuk_on_plane(&plp->plane) >= 0)
            hitchance = 100;
        else {
            hitchance = pln_hitchance(&plp->plane,
@@ -566,7 +542,7 @@ ship_bomb(struct emp_qelem *list, struct sctstr *target)
            /* Bombs that miss have to land somewhere! */
            dam = pln_damage(&plp->plane, target->sct_x, target->sct_y,
                             'p', &nukedam, 0);
-           collateral_damage(target->sct_x, target->sct_y, dam, list);
+           collateral_damage(target->sct_x, target->sct_y, dam);
            dam = 0;
        }
        if (dam <= 0)           /* dam == 0 if only nukes were delivered */
@@ -593,10 +569,9 @@ ship_bomb(struct emp_qelem *list, struct sctstr *target)
               prship(&ship),
               xyas(target->sct_x, target->sct_y, player->cnum));
        }
-       collateral_damage(target->sct_x, target->sct_y, dam / 2, list);
-      next:
-       ;
+       collateral_damage(target->sct_x, target->sct_y, dam / 2);
     }
+out:
     free_shiplist(&head);
 }
 
@@ -608,9 +583,8 @@ plane_bomb(struct emp_qelem *list, struct sctstr *target)
     int n;
     natid own;
     struct plnstr plane;
-    struct emp_qelem *qp;
+    struct emp_qelem *qp, *next;
     int planeno;
-    int ignore;
     struct plist *plp;
     char prompt[128];
     char buf[1024];
@@ -618,48 +592,48 @@ plane_bomb(struct emp_qelem *list, struct sctstr *target)
     int nukedam;
     int nplanes;
 
-    for (qp = list->q_forw; qp != list; qp = qp->q_forw) {
+    for (qp = list->q_forw; qp != list; qp = next) {
+       next = qp->q_forw;
        plp = (struct plist *)qp;
-       if ((plp->pcp->pl_flags & P_C) && (!(plp->pcp->pl_flags & P_T)))
+       if (changed_plane_aborts(plp))
            continue;
-       nplanes = planesatxy(target->sct_x, target->sct_y, 0, 0, list);
+       nplanes = planesatxy(target->sct_x, target->sct_y, 0, 0);
        if (nplanes == 0) {
            pr("%s could not find any planes!\n", prplane(&plp->plane));
            continue;
        }
        (void)sprintf(prompt, "%s, %d bombs.  Target ('~' to skip)? ",
-                     prplane(&plp->plane), plp->bombs);
+                     prplane(&plp->plane), plp->load);
        planeno = -1;
-       ignore = 0;
-       while (planeno < 0 && !player->aborted && !ignore) {
-           if ((q = getstring(prompt, buf)) == 0 || *q == 0)
+       while (planeno < 0) {
+           if (!(q = getstring(prompt, buf)))
+               return;
+           if (*q == 0)
                continue;
-           if (*q == '~') {
-               ignore = 1;
-               continue;
-           }
+           if (*q == '~')
+               break;
            if (*q == '?') {
-               planesatxy(target->sct_x, target->sct_y, 0, 0, list);
+               planesatxy(target->sct_x, target->sct_y, 0, 0);
                continue;
            }
-           if (*q == 'd')
-               goto next;
            n = atoi(q);
            if (n < 0)
                continue;
            if (getplane(n, &plane) &&
                plane.pln_x == target->sct_x &&
                plane.pln_y == target->sct_y &&
-               ((plane.pln_flags & PLN_LAUNCHED) == 0) &&
-               (!ac_isflying(&plane, list)))
+               plane.pln_ship < 0 && plane.pln_land < 0 &&
+               !(plane.pln_flags & PLN_LAUNCHED))
                planeno = n;
            else
                pr("Plane #%d not spotted\n", n);
        }
        if (planeno < 0)
            continue;
+       if (changed_plane_aborts(plp))
+           continue;
        dam = 0;
-       if (plp->plane.pln_nuketype != -1)
+       if (nuk_on_plane(&plp->plane) >= 0)
            hitchance = 100;
        else {
            hitchance = pln_hitchance(&plp->plane, 0, EF_PLANE);
@@ -674,7 +648,7 @@ plane_bomb(struct emp_qelem *list, struct sctstr *target)
            /* Bombs that miss have to land somewhere! */
            dam = pln_damage(&plp->plane, target->sct_x, target->sct_y,
                             'p', &nukedam, 0);
-           collateral_damage(target->sct_x, target->sct_y, dam, list);
+           collateral_damage(target->sct_x, target->sct_y, dam);
            dam = 0;
        }
        if (dam <= 0)           /* dam == 0 if only nukes were delivered */
@@ -701,9 +675,7 @@ plane_bomb(struct emp_qelem *list, struct sctstr *target)
               cname(player->cnum), dam, prplane(&plane),
               xyas(target->sct_x, target->sct_y, own));
        putplane(plane.pln_uid, &plane);
-       collateral_damage(target->sct_x, target->sct_y, dam, list);
-      next:
-       ;
+       collateral_damage(target->sct_x, target->sct_y, dam);
     }
 }
 
@@ -717,16 +689,17 @@ land_bomb(struct emp_qelem *list, struct sctstr *target)
     char prompt[128];
     char buf[1024];
     struct lndstr land;
-    struct emp_qelem *qp;
+    struct emp_qelem *qp, *next;
     int unitno;
-    int ignore, flak, hitchance;
+    int aaf, flak, hitchance;
     struct plist *plp;
     int nukedam;
     int nunits;
 
-    for (qp = list->q_forw; qp != list; qp = qp->q_forw) {
+    for (qp = list->q_forw; qp != list; qp = next) {
+       next = qp->q_forw;
        plp = (struct plist *)qp;
-       if ((plp->pcp->pl_flags & P_C) && (!(plp->pcp->pl_flags & P_T)))
+       if (changed_plane_aborts(plp))
            continue;
        nunits = unitsatxy(target->sct_x, target->sct_y, 0, 0);
        if (nunits == 0) {
@@ -734,26 +707,24 @@ land_bomb(struct emp_qelem *list, struct sctstr *target)
            continue;
        }
        (void)sprintf(prompt, "%s, %d bombs.  Target ('~' to skip)? ",
-                     prplane(&plp->plane), plp->bombs);
+                     prplane(&plp->plane), plp->load);
        unitno = -1;
-       ignore = 0;
-       while (unitno < 0 && !player->aborted && !ignore) {
-           if ((q = getstring(prompt, buf)) == 0 || *q == 0)
+       while (unitno < 0) {
+           if (!(q = getstring(prompt, buf)))
+               return;
+           if (*q == 0)
                continue;
-           if (*q == '~') {
-               ignore = 1;
-               continue;
-           }
+           if (*q == '~')
+               break;
            if (*q == '?') {
                unitsatxy(target->sct_x, target->sct_y, 0, 0);
                continue;
            }
-           if (*q == 'd')
-               goto next;
            n = atoi(q);
            if (n < 0)
                continue;
-           if (getland(n, &land) &&
+           if (getland(n, &land) && land.lnd_own &&
+               land.lnd_ship < 0 && land.lnd_land < 0 &&
                land.lnd_x == target->sct_x && land.lnd_y == target->sct_y)
                unitno = n;
            else
@@ -761,18 +732,22 @@ land_bomb(struct emp_qelem *list, struct sctstr *target)
        }
        if (unitno < 0)
            continue;
+       if (changed_plane_aborts(plp))
+           continue;
 
-       flak = (int)(techfact(land.lnd_tech, land.lnd_aaf) * 3.0);
-       if (flak) {
+       aaf = lnd_aaf(&land);
+       if (aaf) {
+           flak = roundavg(techfact(land.lnd_tech,
+                                    aaf * 3.0 * land.lnd_effic / 100.0));
            PR(land.lnd_own,
               "Flak! Firing flak guns from unit %s (aa rating %d)\n",
-              prland(&land), land.lnd_aaf);
+              prland(&land), aaf);
            if (pinflak_planedamage(&plp->plane, plp->pcp, land.lnd_own, flak))
                continue;
        }
 
        dam = 0;
-       if (plp->plane.pln_nuketype != -1)
+       if (nuk_on_plane(&plp->plane) >= 0)
            hitchance = 100;
        else {
            hitchance = pln_hitchance(&plp->plane,
@@ -787,7 +762,7 @@ land_bomb(struct emp_qelem *list, struct sctstr *target)
            /* Bombs that miss have to land somewhere! */
            dam = pln_damage(&plp->plane, target->sct_x, target->sct_y,
                             'p', &nukedam, 0);
-           collateral_damage(target->sct_x, target->sct_y, dam, list);
+           collateral_damage(target->sct_x, target->sct_y, dam);
            dam = 0;
        }
        if (dam <= 0)           /* dam == 0 if only nukes were delivered */
@@ -795,9 +770,8 @@ land_bomb(struct emp_qelem *list, struct sctstr *target)
        if (dam > 100)
            dam = 100;
        own = land.lnd_own;
-       if (own != 0)
-           mpr(own, "%s pinpoint bombing raid did %d damage to %s\n",
-               cname(player->cnum), dam, prland(&land));
+       mpr(own, "%s pinpoint bombing raid did %d damage to %s\n",
+           cname(player->cnum), dam, prland(&land));
        check_retreat_and_do_landdamage(&land, dam);
 
        if (land.lnd_rflags & RET_BOMBED)
@@ -805,9 +779,7 @@ land_bomb(struct emp_qelem *list, struct sctstr *target)
                retreat_land(&land, 'b');
        nreport(player->cnum, N_UNIT_BOMB, own, 1);
        putland(land.lnd_uid, &land);
-       collateral_damage(target->sct_x, target->sct_y, dam, list);
-      next:
-       ;
+       collateral_damage(target->sct_x, target->sct_y, dam);
     }
 }
 
@@ -822,11 +794,8 @@ strat_bomb(struct emp_qelem *list, struct sctstr *target)
 
     for (qp = list->q_forw; qp != list; qp = qp->q_forw) {
        plp = (struct plist *)qp;
-       if ((plp->pcp->pl_flags & P_C) && (!(plp->pcp->pl_flags & P_T)))
-           continue;
-       if (plp->bombs || plp->plane.pln_nuketype != -1)
-           dam += pln_damage(&plp->plane, target->sct_x, target->sct_y,
-                             's', &nukedam, 1);
+       dam += pln_damage(&plp->plane, target->sct_x, target->sct_y,
+                         's', &nukedam, 1);
     }
     if (dam <= 0)              /* dam == 0 if only nukes were delivered */
        return;
@@ -837,13 +806,23 @@ strat_bomb(struct emp_qelem *list, struct sctstr *target)
           cname(player->cnum), PERCENT_DAMAGE(dam),
           xyas(target->sct_x, target->sct_y, target->sct_own));
 
-    sectdamage(target, dam, list);
+    sectdamage(target, dam);
 
     pr("did %d damage in %s\n", PERCENT_DAMAGE(dam),
        xyas(target->sct_x, target->sct_y, player->cnum));
     putsect(&sect);
 }
 
+static int
+changed_plane_aborts(struct plist *plp)
+{
+    if (check_plane_ok(&plp->plane))
+       return 0;
+    getplane(plp->plane.pln_uid, &plp->plane);
+    pln_put1(plp);
+    return 1;
+}
+
 static int
 pinflak_planedamage(struct plnstr *pp, struct plchrstr *pcp, natid from,
                    int flak)
@@ -851,12 +830,10 @@ pinflak_planedamage(struct plnstr *pp, struct plchrstr *pcp, natid from,
     int disp;
     char dmess[255];
     int eff;
-    struct shpstr ship;
-    struct lndstr land;
     natid plane_owner;
     int dam;
 
-    dam = ac_flak_dam(flak, pp->pln_def, pcp->pl_flags);
+    dam = ac_flak_dam(flak, pln_def(pp), pcp->pl_flags);
     disp = 0;
     plane_owner = pp->pln_own;
     eff = pp->pln_effic;
@@ -870,7 +847,7 @@ pinflak_planedamage(struct plnstr *pp, struct plchrstr *pcp, natid from,
        sprintf(dmess, " -- shot down");
        disp = 1;
     } else if (chance((100 - eff) / 100.0)) {
-       sprintf(dmess, " -- aborted with %d%%%% damage", 100 - eff);
+       sprintf(dmess, " -- aborted with %d%% damage", 100 - eff);
        disp = 2;
     }
     PR(plane_owner, "    Flak! %s %s takes %d%s.\n",
@@ -880,14 +857,6 @@ pinflak_planedamage(struct plnstr *pp, struct plchrstr *pcp, natid from,
     if (disp == 1) {
        if (from != 0)
            nreport(from, N_DOWN_PLANE, pp->pln_own, 1);
-       if (pp->pln_ship >= 0) {
-           getship(pp->pln_ship, &ship);
-           take_plane_off_ship(pp, &ship);
-       }
-       if (pp->pln_land >= 0) {
-           getland(pp->pln_land, &land);
-           take_plane_off_land(pp, &land);
-       }
     }
     putplane(pp->pln_uid, pp);