empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

launch interception: Drop support for ABM, a-sat consuming shells

Browse source 
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 <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2021-01-04 10:58:31 +01:00
parent 10060390f5
commit 0d53d1a6e9
4 changed files with 7 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/lib/commands/laun.c
View file

@ -151,7 +151,7 @@ launch_as(struct plnstr *pp)
pr("Range too great!\n"); pr("Range too great!\n");
return RET_FAIL; return RET_FAIL;
} }
if (msl_equip(pp, 'i') < 0) if (msl_equip(pp, 0) < 0)
return RET_FAIL; return RET_FAIL;
if (msl_launch(pp, EF_PLANE, prplane(&plane), if (msl_launch(pp, EF_PLANE, prplane(&plane),
plane.pln_x, plane.pln_y, plane.pln_own, NULL) < 0) plane.pln_x, plane.pln_y, plane.pln_own, NULL) < 0)

8
src/lib/subs/mission.c
View file

@ -29,7 +29,7 @@
* Known contributors to this file: * Known contributors to this file:
* Ken Stevens, 1995 * Ken Stevens, 1995
* Steve McClure, 1996-2000 * Steve McClure, 1996-2000
* Markus Armbruster, 2003-2015 * Markus Armbruster, 2003-2021
*/ */
#include <config.h> #include <config.h>
@ -917,12 +917,8 @@ mission_pln_equip(struct plist *plp, struct ichrstr *ip, char mission)
case 'p': /* pinpoint bomb */ case 'p': /* pinpoint bomb */
itype = I_SHELL; itype = I_SHELL;
break; break;
case 'i': /* missile interception */
if (load)
itype = I_SHELL;
break;
case 'e': /* escort */ case 'e': /* escort */
case 0: /* plane interception */ case 0: /* interception */
load = 0; load = 0;
break; break;
default: default:

6
src/lib/subs/mslsub.c
View file

@ -29,7 +29,7 @@
* Known contributors to this file: * Known contributors to this file:
* Ken Stevens, 1995 * Ken Stevens, 1995
* Steve McClure, 1996-2000 * Steve McClure, 1996-2000
* Markus Armbruster, 2004-2012 * Markus Armbruster, 2004-2021
*/ */
#include <config.h> #include <config.h>
@ -257,7 +257,7 @@ msl_intercept(struct plnstr *msl, struct sctstr *sp, int sublaunch,
pp = &ip->plane; pp = &ip->plane;
if (pp->pln_own != sp->sct_own) if (pp->pln_own != sp->sct_own)
continue; continue;
if (mission_pln_equip(ip, NULL, 'i') < 0) { if (mission_pln_equip(ip, NULL, 0) < 0) {
emp_remque(qp); emp_remque(qp);
free(qp); free(qp);
continue; continue;
@ -275,7 +275,7 @@ msl_intercept(struct plnstr *msl, struct sctstr *sp, int sublaunch,
next = qp->q_forw; next = qp->q_forw;
ip = (struct plist *)qp; ip = (struct plist *)qp;
pp = &ip->plane; pp = &ip->plane;
if (mission_pln_equip(ip, NULL, 'i') < 0) { if (mission_pln_equip(ip, NULL, 0) < 0) {
emp_remque(qp); emp_remque(qp);
free(qp); free(qp);
continue; continue;

9
src/lib/subs/plnsub.c
View file

@ -30,7 +30,7 @@
* Dave Pare, 1986 * Dave Pare, 1986
* Ken Stevens, 1995 * Ken Stevens, 1995
* Steve McClure, 1998-2000 * Steve McClure, 1998-2000
* Markus Armbruster, 2004-2020 * Markus Armbruster, 2004-2021
*/ */
#include <config.h> #include <config.h>
@ -714,13 +714,6 @@ pln_equip(struct plist *plp, struct ichrstr *ip, char mission)
case 'e': /* escort */ case 'e': /* escort */
load = 0; load = 0;
break; 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: default:
CANT_REACH(); CANT_REACH();
load = 0; load = 0;