From: Markus Armbruster <armbru@pond.sub.org>
Date: Mon, 4 Jan 2021 08:58:52 +0000 (+0100)
Subject: mission: Don't permit SAMs on escort missions
X-Git-Tag: v4.4.1~37
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=da9d5c64043f767283076b3f975e3b67f4a79fd3

mission: Don't permit SAMs on escort missions

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>
---

diff --git a/src/lib/commands/miss.c b/src/lib/commands/miss.c
index 0e49a055c..52b3919b9 100644
--- a/src/lib/commands/miss.c
+++ b/src/lib/commands/miss.c
@@ -29,7 +29,7 @@
  *  Known contributors to this file:
  *     Thomas Ruschak, 1992
  *     Steve McClure, 2000
- *     Markus Armbruster, 2005-2016
+ *     Markus Armbruster, 2005-2021
  */
 
 #include <config.h>
@@ -222,6 +222,12 @@ mission(void)
 	    struct plchrstr *pcp;
 
 	    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)) {
 		pr("Only planes with the escort or intercept abilities can escort.\n"
 		   "%s #%d is ineligible\n",