Make skywatch report satellite uid

The uid is required for launching a-sats since commit 1ee02875,
v4.3.23.

Change output to resemble coastwatch's.

diff --git a/src/lib/commands/skyw.c b/src/lib/commands/skyw.c
index 709f8b1a774719c39b2556bf47fb6f4477062a75..349ca7e96c77edfde10d670dddc5241be561c0d7 100644 (file)
--- a/src/lib/commands/skyw.c
+++ b/src/lib/commands/skyw.c
@@ -87,7 +87,7 @@ skyw(void)
     /* get that last one! */
     free(skyp);
     pr("- = [ Skywatch report for %s ] = -\n", cname(player->cnum));
-    pr(" %18s%20s        %s\n", "Country", "Satellite", "Location");
+    pr("  Country            Satellite     Location\n");
     tech = tfact(player->cnum, 1.0);
     while (nxtsct(&nstr, &sect) && nsat) {
        if (sect.sct_own != player->cnum)
@@ -134,7 +134,6 @@ showsat(struct sky **skypp, int x, int y)
     struct sky *todelete = NULL;
     struct sky **prev;
     struct plchrstr *pcp;
-    char *name;
     int nsat = 0;
 
     prev = NULL;
@@ -151,10 +150,9 @@ showsat(struct sky **skypp, int x, int y)
            continue;
        }
        pcp = &plchr[(int)skyp->s_sat.pln_type];
-       name = pcp->pl_name;
-       pr(" %12.12s (#%d) %20s            %s\n",
+       pr(" %12.12s (#%3d) %s @ %s\n",
           cname(skyp->s_sat.pln_own), skyp->s_sat.pln_own,
-          name, xyas(x, y, player->cnum));
+          prplane(&skyp->s_sat), xyas(x, y, player->cnum));
        if (opt_HIDDEN) {
            /* FOUND_COAST should probably be changed to FOUND_SKY -KHS */
            setcont(player->cnum, skyp->s_sat.pln_own, FOUND_COAST);