projects
/
empserver
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
1f28653
)
Interdiction attacked submarines with surface-only weapons
hvy-plastic-2.1
author
Markus Armbruster
<armbru@pond.sub.org>
Wed, 10 Mar 2010 07:54:06 +0000
(08:54 +0100)
committer
Markus Armbruster
<armbru@pond.sub.org>
Wed, 10 Mar 2010 08:44:31 +0000
(09:44 +0100)
shp_mission_interdiction() used MI_INTERDICT instead of MI_SINTERDICT.
Broken in commit
cd8fe31e
, v4.3.24.
(cherry picked from commit
2dd97dbd00202643f4c61ba4e6aceb1eecd7797a
)
src/lib/subs/shpsub.c
patch
|
blob
|
history
diff --git
a/src/lib/subs/shpsub.c
b/src/lib/subs/shpsub.c
index 465b0d678b5f88a7541cdeec6375628380efb566..51fe707949ef9aa53d1b3d4128025bd3f78d1066 100644
(file)
--- 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;