X-Git-Url: http://git.pond.sub.org/?p=empserver;a=blobdiff_plain;f=src%2Flib%2Fcommands%2Fskyw.c;h=37606788e9864e8dc24f35f007d6d68448c4b894;hp=56868799e42e17bbc595d3f365143a291ec0c638;hb=9b7adfbe;hpb=5f263a7753dc728809ff85c993af975f6c76e61e

diff --git a/src/lib/commands/skyw.c b/src/lib/commands/skyw.c
index 56868799e..37606788e 100644
--- a/src/lib/commands/skyw.c
+++ b/src/lib/commands/skyw.c
@@ -46,12 +46,12 @@
 #define	TSIZE	200
 
 struct sky {
-	struct sky *s_next;
-	int s_spotted;
-	struct plnstr s_sat;
+    struct sky *s_next;
+    int s_spotted;
+    struct plnstr s_sat;
 };
 
-static	int showsat(struct sky **skypp, int x, int y);
+static int showsat(struct sky **skypp, int x, int y);
 
 /*
  * format: skywatch [<SECTS>]
@@ -59,118 +59,118 @@ static	int showsat(struct sky **skypp, int x, int y);
 int
 skyw(void)
 {
-	struct sctstr sect;
-	struct nstr_sect nstr;
-	struct sky *skyp;
-	struct sky *list[TSIZE];
-	int i, k, j, n;
-	int vrange, see;
-	int x, y;
-	int mink, minj, maxk, maxj;
-	int nsat = 0;
-	float tech;
-	struct	nstr_item ni;
+    struct sctstr sect;
+    struct nstr_sect nstr;
+    struct sky *skyp;
+    struct sky *list[TSIZE];
+    int i, k, j, n;
+    int vrange, see;
+    int x, y;
+    int mink, minj, maxk, maxj;
+    int nsat = 0;
+    float tech;
+    struct nstr_item ni;
 
-	if (snxtsct(&nstr, player->argp[1]) == 0)
-		return RET_SYN;
-	for (i = 0; i < TSIZE; i++)
-		list[i] = 0;
+    if (snxtsct(&nstr, player->argp[1]) == 0)
+	return RET_SYN;
+    for (i = 0; i < TSIZE; i++)
+	list[i] = 0;
+    skyp = (struct sky *)malloc(sizeof(*skyp));
+    snxtitem_all(&ni, EF_PLANE);
+    while (nxtitem(&ni, (s_char *)&skyp->s_sat)) {
+	if (!skyp->s_sat.pln_own)
+	    continue;
+	if (!(skyp->s_sat.pln_flags & PLN_LAUNCHED))
+	    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));
-	snxtitem_all(&ni, EF_PLANE);
-	while (nxtitem(&ni, (s_char *) &skyp->s_sat)) {
-		if (!skyp->s_sat.pln_own)
-			continue;
-		if (!(skyp->s_sat.pln_flags & PLN_LAUNCHED))
-			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));
-		nsat++;
+	nsat++;
+    }
+    /* get that last one! */
+    free((s_char *)skyp);
+    pr("- = [ Skywatch report for %s ] = -\n", cname(player->cnum));
+    pr(" %18s%20s        %s\n", "Country", "Satellite", "Location");
+    tech = tfact(player->cnum, 1.0);
+    while (nxtsct(&nstr, &sect) && nsat) {
+	if (sect.sct_own != player->cnum)
+	    continue;
+	see = sect.sct_type == SCT_RADAR ? 14 : 4;
+	vrange = (int)(sect.sct_effic / 100.0 * see * tech);
+	if (vrange < 1)
+	    vrange = 1;
+	maxk = vrange;
+	maxj = vrange * 2;
+	vrange *= vrange;
+	mink = -maxk;
+	minj = -maxj;
+	for (j = minj; j <= maxj && nsat; j++) {
+	    x = xnorm(sect.sct_x + j);
+	    for (k = mink; k <= maxk && nsat; k++) {
+		if ((j + k) & 01)
+		    continue;
+		/* quick range check to save time... */
+		if (vrange < (j * j + 3 * k * k) / 4)
+		    continue;
+		y = ynorm(sect.sct_y + k);
+		n = scthash(x, y, TSIZE);
+		if (list[n] == 0)
+		    continue;
+		nsat -= showsat(&list[n], x, y);
+	    }
 	}
-	/* get that last one! */
-	free((s_char *)skyp);
-	pr("- = [ Skywatch report for %s ] = -\n", cname(player->cnum));
-	pr(" %18s%20s        %s\n","Country", "Satellite", "Location");
-	tech = tfact(player->cnum, 1.0);
-	while (nxtsct(&nstr, &sect) && nsat) {
-		if (sect.sct_own != player->cnum)
-			continue;
-		see = sect.sct_type == SCT_RADAR ? 14 : 4;
-		vrange = (int) (sect.sct_effic / 100.0 * see * tech);
-		if (vrange < 1)
-			vrange = 1;
-		maxk = vrange;
-		maxj = vrange * 2;
-		vrange *= vrange;
-		mink = -maxk;
-		minj = -maxj;
-		for (j = minj; j <= maxj && nsat; j++) {
-			x = xnorm(sect.sct_x + j);
-			for (k = mink; k <= maxk && nsat; k++) {
-				if ((j + k) & 01)
-					 continue;
-				/* quick range check to save time... */
-				if (vrange < (j * j + 3 * k * k) / 4)
-					continue;
-				y = ynorm(sect.sct_y + k);
-				n = scthash(x, y, TSIZE);
-				if (list[n] == 0)
-					continue;
-				nsat -= showsat(&list[n], x, y);
-			}
-		}
+    }
+    /* free up the sky structs calloc'ed above */
+    for (i = 0; i < TSIZE; i++) {
+	while (NULL != (skyp = list[i])) {
+	    list[i] = skyp->s_next;
+	    free((s_char *)skyp);
 	}
-	/* free up the sky structs calloc'ed above */
-	for (i = 0; i < TSIZE; i++) {
-		while (NULL != (skyp = list[i])) {
-			list[i] = skyp->s_next;
-			free((s_char *)skyp);
-		}
-	}
-	return RET_OK;
+    }
+    return RET_OK;
 }
 
 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;
-	int	nsat = 0;
+    register struct sky *skyp;
+    register struct sky *todelete = 0;
+    register struct sky **prev;
+    register struct plchrstr *pcp;
+    s_char *name;
+    int nsat = 0;
 
-	prev = 0;
-	skyp = *skypp;
-	prev = skypp;
-	do {
-		/* we delete it, we free it. */
-		if (todelete) {
-			free((s_char *)todelete);
-			todelete = 0;
-		}
-		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",
-			cname(skyp->s_sat.pln_own), skyp->s_sat.pln_own,
-			name, 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);
-		}
-		*prev = skyp->s_next;
-		todelete = skyp;
-		nsat++;
-	} while (NULL != (skyp = skyp->s_next));
-	/* check that last one! */
-	if (todelete)
-		free((s_char *)todelete);
-	return (nsat);
+    prev = 0;
+    skyp = *skypp;
+    prev = skypp;
+    do {
+	/* we delete it, we free it. */
+	if (todelete) {
+	    free((s_char *)todelete);
+	    todelete = 0;
+	}
+	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",
+	   cname(skyp->s_sat.pln_own), skyp->s_sat.pln_own,
+	   name, 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);
+	}
+	*prev = skyp->s_next;
+	todelete = skyp;
+	nsat++;
+    } while (NULL != (skyp = skyp->s_next));
+    /* check that last one! */
+    if (todelete)
+	free((s_char *)todelete);
+    return (nsat);
 }