From 61f0762eaa84153ad8eac74070333b1ef93cf42c Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Mon, 4 Jan 2021 10:58:31 +0100 Subject: [PATCH] launch interception: Drop support for ABM, a-sat consuming shells Their impact on the target does not depend on shell load (it sometimes did for a-sats until commit cf960a573 "Make anti-sat launch consistent with interception", v4.3.23). The shell use is logistical busy-work, and economically irrelevant. Remove it. Signed-off-by: Markus Armbruster --- src/lib/commands/laun.c | 2 +- src/lib/subs/mission.c | 8 ++------ src/lib/subs/mslsub.c | 6 +++--- src/lib/subs/plnsub.c | 9 +-------- 4 files changed, 7 insertions(+), 18 deletions(-) diff --git a/src/lib/commands/laun.c b/src/lib/commands/laun.c index 2f4fc8054..7a78c4e5c 100644 --- a/src/lib/commands/laun.c +++ b/src/lib/commands/laun.c @@ -151,7 +151,7 @@ launch_as(struct plnstr *pp) pr("Range too great!\n"); return RET_FAIL; } - if (msl_equip(pp, 'i') < 0) + if (msl_equip(pp, 0) < 0) return RET_FAIL; if (msl_launch(pp, EF_PLANE, prplane(&plane), plane.pln_x, plane.pln_y, plane.pln_own, NULL) < 0) diff --git a/src/lib/subs/mission.c b/src/lib/subs/mission.c index 2a1f47c75..40b82c069 100644 --- a/src/lib/subs/mission.c +++ b/src/lib/subs/mission.c @@ -29,7 +29,7 @@ * Known contributors to this file: * Ken Stevens, 1995 * Steve McClure, 1996-2000 - * Markus Armbruster, 2003-2015 + * Markus Armbruster, 2003-2021 */ #include @@ -917,12 +917,8 @@ mission_pln_equip(struct plist *plp, struct ichrstr *ip, char mission) case 'p': /* pinpoint bomb */ itype = I_SHELL; break; - case 'i': /* missile interception */ - if (load) - itype = I_SHELL; - break; case 'e': /* escort */ - case 0: /* plane interception */ + case 0: /* interception */ load = 0; break; default: diff --git a/src/lib/subs/mslsub.c b/src/lib/subs/mslsub.c index 3808611da..8b35e6d2a 100644 --- a/src/lib/subs/mslsub.c +++ b/src/lib/subs/mslsub.c @@ -29,7 +29,7 @@ * Known contributors to this file: * Ken Stevens, 1995 * Steve McClure, 1996-2000 - * Markus Armbruster, 2004-2012 + * Markus Armbruster, 2004-2021 */ #include @@ -257,7 +257,7 @@ msl_intercept(struct plnstr *msl, struct sctstr *sp, int sublaunch, pp = &ip->plane; if (pp->pln_own != sp->sct_own) continue; - if (mission_pln_equip(ip, NULL, 'i') < 0) { + if (mission_pln_equip(ip, NULL, 0) < 0) { emp_remque(qp); free(qp); continue; @@ -275,7 +275,7 @@ msl_intercept(struct plnstr *msl, struct sctstr *sp, int sublaunch, next = qp->q_forw; ip = (struct plist *)qp; pp = &ip->plane; - if (mission_pln_equip(ip, NULL, 'i') < 0) { + if (mission_pln_equip(ip, NULL, 0) < 0) { emp_remque(qp); free(qp); continue; diff --git a/src/lib/subs/plnsub.c b/src/lib/subs/plnsub.c index c349a99ba..afec51f38 100644 --- a/src/lib/subs/plnsub.c +++ b/src/lib/subs/plnsub.c @@ -30,7 +30,7 @@ * Dave Pare, 1986 * Ken Stevens, 1995 * Steve McClure, 1998-2000 - * Markus Armbruster, 2004-2020 + * Markus Armbruster, 2004-2021 */ #include @@ -714,13 +714,6 @@ pln_equip(struct plist *plp, struct ichrstr *ip, char mission) case 'e': /* escort */ load = 0; break; - case 'i': /* missile interception */ - if (CANT_HAPPEN(!(pcp->pl_flags & P_M) - || !(pcp->pl_flags & (P_N | P_O)))) - break; - if (load) - itype = I_SHELL; - break; default: CANT_REACH(); load = 0; -- 2.43.0