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

mission: Don't permit SAMs on escort missions

Browse source 
The mission code doesn't treat SAMs specially: they take off, fly out,
maybe fight, fly home, and land.  Landing triggers the oops in
pln_put1().

Letting SAMs escort makes no sense.  Fix the mission command to reject
them.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2021-01-04 09:58:52 +01:00
parent 1c7d9a67f6
commit 6f3f78481d
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/lib/commands/miss.c
View file

@ -29,7 +29,7 @@
* Known contributors to this file: * Known contributors to this file:
* Thomas Ruschak, 1992 * Thomas Ruschak, 1992
* Steve McClure, 2000 * Steve McClure, 2000
* Markus Armbruster, 2005-2016 * Markus Armbruster, 2005-2021
*/ */
#include <config.h> #include <config.h>
@ -222,6 +222,12 @@ mission(void)
struct plchrstr *pcp; struct plchrstr *pcp;
pcp = &plchr[(int)gp->type]; pcp = &plchr[(int)gp->type];
if (pcp->pl_flags & P_M) {
pr("Missiles can't escort.\n"
"%s #%d is ineligible\n",
pcp->pl_name, gp->uid);
continue;
}
if (!(pcp->pl_flags & P_ESC) && !(pcp->pl_flags & P_F)) { if (!(pcp->pl_flags & P_ESC) && !(pcp->pl_flags & P_F)) {
pr("Only planes with the escort or intercept abilities can escort.\n" pr("Only planes with the escort or intercept abilities can escort.\n"
"%s #%d is ineligible\n", "%s #%d is ineligible\n",