From: Markus Armbruster <armbru@pond.sub.org>
Date: Wed, 10 Mar 2010 07:54:06 +0000 (+0100)
Subject: Interdiction attacked submarines with surface-only weapons
X-Git-Tag: hvy-plastic-2.1^0
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=bd07ee186b0e5c8d21cdf3238b71671ef3226d22

Interdiction attacked submarines with surface-only weapons

shp_mission_interdiction() used MI_INTERDICT instead of MI_SINTERDICT.
Broken in commit cd8fe31e, v4.3.24.
(cherry picked from commit 2dd97dbd00202643f4c61ba4e6aceb1eecd7797a)
---

diff --git a/src/lib/subs/shpsub.c b/src/lib/subs/shpsub.c
index 465b0d678..51fe70794 100644
--- a/src/lib/subs/shpsub.c
+++ b/src/lib/subs/shpsub.c
@@ -649,11 +649,12 @@ shp_mission_interdiction(struct emp_qelem *list, coord x, coord y,
     char *what = subs ? "subs" : "ships";
     int wantflags = subs ? M_SUB : 0;
     int nowantflags = subs ? 0 : M_SUB;
+    int mission = subs ? MI_SINTERDICT : MI_INTERDICT;
     int dam;
 
     dam = unit_interdict(x, y, victim, what,
 			 shp_easiest_target(list, wantflags, nowantflags),
-			 MI_INTERDICT);
+			 mission);
     if (dam >= 0)
 	shp_damage(list, dam, wantflags, nowantflags, x, y);
     return dam >= 0;