Make skywatch report satellite uid

[empserver] / src / lib / commands / skyw.c

diff --git a/src/lib/commands/skyw.c b/src/lib/commands/skyw.c
index 37606788e9864e8dc24f35f007d6d68448c4b894..349ca7e96c77edfde10d670dddc5241be561c0d7 100644 (file)
--- a/src/lib/commands/skyw.c
+++ b/src/lib/commands/skyw.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2000, 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
@@ -19,29 +19,23 @@
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
  *  skyw.c: Look at satellites in the sky.
- * 
+ *
  *  Known contributors to this file:
  *     Ken Stevens, 1995
  */
 
-#include "misc.h"
-#include "player.h"
-#include "var.h"
-#include "sect.h"
-#include "plane.h"
-#include "nat.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
+#include <config.h>
+
 #include "commands.h"
 #include "optlist.h"
+#include "plane.h"
 
 #define        TSIZE   200
 
@@ -68,32 +62,32 @@ skyw(void)
     int x, y;
     int mink, minj, maxk, maxj;
     int nsat = 0;
-    float tech;
+    double tech;
     struct nstr_item ni;
 
-    if (snxtsct(&nstr, player->argp[1]) == 0)
+    if (!snxtsct(&nstr, player->argp[1]))
        return RET_SYN;
     for (i = 0; i < TSIZE; i++)
-       list[i] = 0;
-    skyp = (struct sky *)malloc(sizeof(*skyp));
+       list[i] = NULL;
+    skyp = malloc(sizeof(*skyp));
     snxtitem_all(&ni, EF_PLANE);
-    while (nxtitem(&ni, (s_char *)&skyp->s_sat)) {
+    while (nxtitem(&ni, &skyp->s_sat)) {
        if (!skyp->s_sat.pln_own)
            continue;
-       if (!(skyp->s_sat.pln_flags & PLN_LAUNCHED))
+       if (!pln_is_in_orbit(&skyp->s_sat))
            continue;
        getsect(skyp->s_sat.pln_x, skyp->s_sat.pln_y, &sect);
        n = scthash(skyp->s_sat.pln_x, skyp->s_sat.pln_y, TSIZE);
        skyp->s_spotted = 0;
        skyp->s_next = list[n];
        list[n] = skyp;
-       skyp = (struct sky *)malloc(sizeof(*skyp));
+       skyp = malloc(sizeof(*skyp));
        nsat++;
     }
     /* get that last one! */
-    free((s_char *)skyp);
+    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)
@@ -117,7 +111,7 @@ skyw(void)
                    continue;
                y = ynorm(sect.sct_y + k);
                n = scthash(x, y, TSIZE);
-               if (list[n] == 0)
+               if (!list[n])
                    continue;
                nsat -= showsat(&list[n], x, y);
            }
@@ -127,7 +121,7 @@ skyw(void)
     for (i = 0; i < TSIZE; i++) {
        while (NULL != (skyp = list[i])) {
            list[i] = skyp->s_next;
-           free((s_char *)skyp);
+           free(skyp);
        }
     }
     return RET_OK;
@@ -136,31 +130,29 @@ skyw(void)
 static int
 showsat(struct sky **skypp, int x, int y)
 {
-    register struct sky *skyp;
-    register struct sky *todelete = 0;
-    register struct sky **prev;
-    register struct plchrstr *pcp;
-    s_char *name;
+    struct sky *skyp;
+    struct sky *todelete = NULL;
+    struct sky **prev;
+    struct plchrstr *pcp;
     int nsat = 0;
 
-    prev = 0;
+    prev = NULL;
     skyp = *skypp;
     prev = skypp;
     do {
        /* we delete it, we free it. */
        if (todelete) {
-           free((s_char *)todelete);
-           todelete = 0;
+           free(todelete);
+           todelete = NULL;
        }
        if (skyp->s_sat.pln_x != x || skyp->s_sat.pln_y != y) {
            prev = &(*prev)->s_next;
            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);
@@ -171,6 +163,6 @@ showsat(struct sky **skypp, int x, int y)
     } while (NULL != (skyp = skyp->s_next));
     /* check that last one! */
     if (todelete)
-       free((s_char *)todelete);
-    return (nsat);
+       free(todelete);
+    return nsat;
 }