From 1ee0287595de6ce97f3caeef95f9ab22e49d0736 Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Sun, 13 Sep 2009 13:19:19 -0400
Subject: [PATCH] Change launch of anti-sat to take plane# argument

Before, it took a sector argument, and targeted the lowest-numbered
satellite there.  Rather inconvenient when your own satellite masks
one of the enemy's.

Moreover, the command could be abused to find all sectors with
satellites.  Now it can "only" be abused to find satellite ids, and
whether they're in range.  Still not ideal, but tolerable.
---
 info/launch.t           |  2 +-
 src/lib/commands/laun.c | 36 +++++++++++-------------------------
 2 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/info/launch.t b/info/launch.t
index 974f4c22..ac5fec2b 100644
--- a/info/launch.t
+++ b/info/launch.t
@@ -1,7 +1,7 @@
 .TH Command LAUNCH
 .NA launch "Launch missiles or satellites"
 .LV Expert
-.SY "launch <PLANES> <SECT|SHIP>"
+.SY "launch <PLANES> <SECT|SHIP|PLANE>"
 The launch command is used to launch missiles (or satellites)
 from sectors or submarines owned by you.
 .s1
diff --git a/src/lib/commands/laun.c b/src/lib/commands/laun.c
index cfd05db0..98799ba9 100644
--- a/src/lib/commands/laun.c
+++ b/src/lib/commands/laun.c
@@ -136,39 +136,26 @@ laun(void)
 static int
 launch_as(struct plnstr *pp)
 {
-    coord sx, sy;
     char *cp, buf[1024];
     struct plnstr plane;
-    struct nstr_item ni;
-    int goodtarget;
     int dam, nukedam;
     natid oldown;
 
-    cp = getstarg(player->argp[2], "Target sector? ", buf);
+    cp = getstarg(player->argp[2], "Target satellite? ", buf);
     if (!check_plane_ok(pp))
 	return RET_FAIL;
     if (!cp || !*cp)
 	return RET_SYN;
-    if (!sarg_xy(cp, &sx, &sy)) {
-	pr("Bad sector designation!\n");
-	return RET_SYN;
-    }
-    if (mapdist(pp->pln_x, pp->pln_y, sx, sy) > pp->pln_range) {
-	pr("Range too great!\n");
+    if (!getplane(atoi(cp), &plane) || !plane.pln_own
+	|| !pln_is_in_orbit(&plane)) {
+	pr("No such satellite exists!\n");
 	return RET_FAIL;
+	/* Can be abused to find satellite ids.  Tolerable.  */
     }
-    goodtarget = 0;
-    snxtitem_xy(&ni, EF_PLANE, sx, sy);
-    while (!goodtarget && nxtitem(&ni, &plane)) {
-	if (!plane.pln_own)
-	    continue;
-	if (!pln_is_in_orbit(&plane))
-	    continue;
-	goodtarget = 1;
 
-    }
-    if (!goodtarget) {
-	pr("No satellites there!\n");
+    if (mapdist(pp->pln_x, pp->pln_y, plane.pln_x, plane.pln_y)
+	> pp->pln_range) {
+	pr("Range too great!\n");
 	return RET_FAIL;
     }
     if (msl_equip(pp, 'p') < 0) {
@@ -176,10 +163,9 @@ launch_as(struct plnstr *pp)
 	return RET_FAIL;
     }
     if (msl_hit(pp, pln_def(&plane), EF_PLANE, N_SAT_KILL, N_SAT_KILL,
-		prplane(&plane), sx, sy, plane.pln_own)) {
-	dam = pln_damage(pp, sx, sy, 'p', &nukedam, 1);
-	if (CANT_HAPPEN(nukedam))
-	    return RET_OK;
+		prplane(&plane), plane.pln_x, plane.pln_y, plane.pln_own)) {
+	dam = pln_damage(pp, plane.pln_x, plane.pln_y, 'p', &nukedam, 1);
+	CANT_HAPPEN(nukedam);
 	oldown = plane.pln_own;
 	planedamage(&plane, dam);
 	pr("Hit satellite for %d%% damage!\n", dam);