No need to take dead planes off carrier anymore

Until commit 3e370da5, dead planes had to be explicitely taken off
their carrier to update load counters.  This is no longer necessary;
simplify pln_put1() and scut().  scut() got it wrong, by the way: it
failed to take planes off land units.

diff --git a/src/lib/commands/scut.c b/src/lib/commands/scut.c
index f6847a29ace2ed65a46aba727ebcad07bbe511c3..7c6b45927e18671f9a3ccd73141fb1824ab068fd 100644 (file)
--- a/src/lib/commands/scut.c
+++ b/src/lib/commands/scut.c
@@ -143,12 +143,6 @@ scut(void)
            scuttle_land(&item.land);
        } else {
            pr("%s", prplane(&item.plane));
-           if (item.plane.pln_ship >= 0) {
-               struct shpstr ship;
-
-               getship(item.plane.pln_ship, &ship);
-               take_plane_off_ship(&item.plane, &ship);
-           }
            item.plane.pln_effic = 0;
            putplane(item.plane.pln_uid, &item.plane);
        }

diff --git a/src/lib/subs/plnsub.c b/src/lib/subs/plnsub.c
index 61fac77bb0d9758f3f7004e4131f3a59fdcbcd15..45eb43714a089a7003122542461ce98d2fb5cf7e 100644 (file)
--- a/src/lib/subs/plnsub.c
+++ b/src/lib/subs/plnsub.c
@@ -756,7 +756,6 @@ pln_put1(struct plist *plp)
 {
     struct plnstr *pp;
     struct shpstr ship;
-    struct lndstr land;
     struct sctstr sect;
 
     pp = &plp->plane;
@@ -769,15 +768,7 @@ pln_put1(struct plist *plp)
     if (!(pp->pln_flags & PLN_LAUNCHED))
        ;                       /* never took off */
     else if (pp->pln_effic < PLANE_MINEFF) {
-       /* destroyed */
-       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);
-       }
+       ;                       /* destroyed */
     } else if (pp->pln_ship >= 0) {
        /* It is landing on a carrier */
        getship(pp->pln_ship, &ship);