From: Markus Armbruster <armbru@pond.sub.org>
Date: Sat, 10 Oct 2009 15:54:49 +0000 (-0400)
Subject: Don't attempt to hide owner of sub-launched satellite
X-Git-Tag: v4.3.23~18
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=0f0d785601b82c884415dbfff6048c5ec0591734

Don't attempt to hide owner of sub-launched satellite

The attempt was pointless, because the recipient of the message could
see the owner on skywatch, and the news reported it as well.
---

diff --git a/src/lib/commands/laun.c b/src/lib/commands/laun.c
index cc5746024..11c1b88c8 100644
--- a/src/lib/commands/laun.c
+++ b/src/lib/commands/laun.c
@@ -48,7 +48,7 @@
 
 static int launch_as(struct plnstr *pp);
 static int launch_missile(struct plnstr *pp, int sublaunch);
-static int launch_sat(struct plnstr *pp, int sublaunch);
+static int launch_sat(struct plnstr *pp);
 static int msl_equip(struct plnstr *, char);
 
 /*
@@ -117,7 +117,7 @@ laun(void)
 	    retval = launch_as(&plane);
 	    gone = 1;
 	} else {		/* satellites */
-	    retval = launch_sat(&plane, sublaunch);
+	    retval = launch_sat(&plane);
 	    gone = !(plane.pln_flags & PLN_LAUNCHED);
 	}
 	if (retval != RET_OK)
@@ -311,7 +311,7 @@ launch_missile(struct plnstr *pp, int sublaunch)
  * else RET_SYN or RET_FAIL.
  */
 static int
-launch_sat(struct plnstr *pp, int sublaunch)
+launch_sat(struct plnstr *pp)
 {
     struct plchrstr *pcp = plchr + pp->pln_type;
     coord sx, sy;
@@ -361,7 +361,7 @@ launch_sat(struct plnstr *pp, int sublaunch)
 	pr("Your trajectory was a little off.\n");
     }
     nreport(player->cnum, N_LAUNCH, 0, 1);
-    if (msl_intercept(sx, sy, pp->pln_own, pcp->pl_def, sublaunch, P_O, 0)) {
+    if (msl_intercept(sx, sy, pp->pln_own, pcp->pl_def, 0, P_O, 0)) {
 	return RET_OK;
     }
     pp->pln_x = sx;
diff --git a/src/lib/subs/mslsub.c b/src/lib/subs/mslsub.c
index 8b0b3daba..3bb8cb75f 100644
--- a/src/lib/subs/mslsub.c
+++ b/src/lib/subs/mslsub.c
@@ -229,9 +229,9 @@ msl_intercept(coord x, coord y, natid bombown, int hardtarget,
 	att_name = "satellite";
 	def_name = "a-sat missile";
 	news_item = N_SAT_KILL;
+	CANT_HAPPEN(sublaunch);
 	mpr(sect.sct_own, "%s has positioned a satellite over %s\n",
-	    sublaunch ? "someone" : cname(bombown),
-	    xyas(x, y, sect.sct_own));
+	    cname(bombown), xyas(x, y, sect.sct_own));
     } else if (wantflags == P_N && nowantflags == P_O) {
 	att_name = "warhead";
 	def_name = "abm";