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>
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)
* Known contributors to this file:
* Ken Stevens, 1995
* Steve McClure, 1996-2000
- * Markus Armbruster, 2003-2015
+ * Markus Armbruster, 2003-2021
*/
#include <config.h>
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:
* Known contributors to this file:
* Ken Stevens, 1995
* Steve McClure, 1996-2000
- * Markus Armbruster, 2004-2012
+ * Markus Armbruster, 2004-2021
*/
#include <config.h>
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;
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;
* Dave Pare, 1986
* Ken Stevens, 1995
* Steve McClure, 1998-2000
- * Markus Armbruster, 2004-2020
+ * Markus Armbruster, 2004-2021
*/
#include <config.h>
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;