X-Git-Url: http://git.pond.sub.org/?p=empserver;a=blobdiff_plain;f=src%2Flib%2Fsubs%2Fshpsub.c;h=51fe707949ef9aa53d1b3d4128025bd3f78d1066;hp=3ed92344a21e2de684157d08c9b33e4365166ced;hb=bd07ee186b0e5c8d21cdf3238b71671ef3226d22;hpb=ef7ea8934ffc7a7d480ee985ffa0b8908e05bb07

diff --git a/src/lib/subs/shpsub.c b/src/lib/subs/shpsub.c
index 3ed92344a..51fe70794 100644
--- a/src/lib/subs/shpsub.c
+++ b/src/lib/subs/shpsub.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -500,6 +500,7 @@ shp_missile_interdiction(struct emp_qelem *list, coord newx, coord newy,
 	    if (msl_launch(&plp->plane, EF_SHIP, prship(&mvs->unit.ship),
 			   newx, newy, victim, &sublaunch) < 0)
 		goto use_up_msl;
+	    stopping = 1;
 	    if (msl_hit(&plp->plane,
 			shp_hardtarget(&mvs->unit.ship), EF_SHIP,
 			N_SHP_MISS, N_SHP_SMISS, sublaunch, victim)) {
@@ -509,7 +510,6 @@ shp_missile_interdiction(struct emp_qelem *list, coord newx, coord newy,
 			"missile interdiction mission does %d damage to %s!\n",
 			dam, prship(&mvs->unit.ship));
 		    shp_damage_one(mvs, dam);
-		    stopping = 1;
 		}
 	    } else {
 		dam = pln_damage(&plp->plane, 'p', 0);
@@ -578,6 +578,7 @@ shp_fort_interdiction(struct emp_qelem *list, coord newx, coord newy,
     struct sctstr fsect;
     int trange, range;
     int dam;
+    int stopping = 0;
     int totdam = 0;
     signed char notified[MAXNOC];
     int i;
@@ -621,6 +622,7 @@ shp_fort_interdiction(struct emp_qelem *list, coord newx, coord newy,
 	putsect(&fsect);
 	if (dam < 0)
 	    continue;
+	stopping = 1;
 	totdam += dam;
 	mpr(victim, "Incoming fire does %d damage!\n", dam);
 #if 0
@@ -636,8 +638,26 @@ shp_fort_interdiction(struct emp_qelem *list, coord newx, coord newy,
 	nreport(fsect.sct_own, N_SHP_SHELL, victim, 1);
     }
     if (totdam > 0)
-	return shp_damage(list, totdam, 0, M_SUB, newx, newy);
-    return 0;
+	shp_damage(list, totdam, 0, M_SUB, newx, newy);
+    return stopping;
+}
+
+static int
+shp_mission_interdiction(struct emp_qelem *list, coord x, coord y,
+			 natid victim, int subs)
+{
+    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),
+			 mission);
+    if (dam >= 0)
+	shp_damage(list, dam, wantflags, nowantflags, x, y);
+    return dam >= 0;
 }
 
 static int
@@ -649,23 +669,12 @@ shp_interdict(struct emp_qelem *list, coord newx, coord newy, natid victim)
 	stopping |= shp_fort_interdiction(list, newx, newy, victim);
 
 	if (shp_contains(list, newx, newy, 0, M_SUB)) {
-	    stopping |=
-		shp_damage(list,
-			   unit_interdict(newx, newy, victim, "ships",
-					  shp_easiest_target(list, 0, M_SUB),
-					  MI_INTERDICT),
-			   0, M_SUB, newx, newy);
+	    stopping |= shp_mission_interdiction(list, newx, newy, victim, 0);
 	    stopping |= shp_missile_interdiction(list, newx, newy, victim);
 	}
     }
-    if (shp_contains(list, newx, newy, M_SUB, 0)) {
-	stopping |=
-	    shp_damage(list,
-		       unit_interdict(newx, newy, victim, "subs",
-				      shp_easiest_target(list, M_SUB, 0),
-				      MI_SINTERDICT),
-		       M_SUB, 0, newx, newy);
-    }
+    if (shp_contains(list, newx, newy, M_SUB, 0))
+	stopping |= shp_mission_interdiction(list, newx, newy, victim, 1);
     return stopping;
 }