Update copyright notice

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

diff --git a/src/lib/commands/skyw.c b/src/lib/commands/skyw.c
index 7816f5ac07a377550d27431e89ba1ed5734c6ff2..617511e6fd2fbb13dd1397d5d0cc837275e7f79c 100644 (file)
--- a/src/lib/commands/skyw.c
+++ b/src/lib/commands/skyw.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2015, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
@@ -29,6 +28,7 @@
  *
  *  Known contributors to this file:
  *     Ken Stevens, 1995
+ *     Markus Armbruster, 2010
  */
 
 #include <config.h>
@@ -37,7 +37,7 @@
 #include "optlist.h"
 #include "plane.h"
 
-#define        TSIZE   200
+#define TSIZE  200
 
 struct sky {
     struct sky *s_next;
@@ -57,10 +57,9 @@ skyw(void)
     struct nstr_sect nstr;
     struct sky *skyp;
     struct sky *list[TSIZE];
-    int i, k, j, n;
+    int i, n;
     int vrange, see;
-    int x, y;
-    int mink, minj, maxk, maxj;
+    int x, y, dx, dy, dxmax;
     int nsat = 0;
     double tech;
     struct nstr_item ni;
@@ -87,7 +86,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)
@@ -96,20 +95,11 @@ skyw(void)
        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);
+       for (dy = -vrange; dy <= vrange; dy++) {
+           y = ynorm(sect.sct_y + dy);
+           dxmax = 2 * vrange - abs(dy);
+           for (dx = -dxmax; dx <= dxmax; dx += 2) {
+               x = xnorm(sect.sct_x + dx);
                n = scthash(x, y, TSIZE);
                if (!list[n])
                    continue;
@@ -133,8 +123,6 @@ showsat(struct sky **skypp, int x, int y)
     struct sky *skyp;
     struct sky *todelete = NULL;
     struct sky **prev;
-    struct plchrstr *pcp;
-    char *name;
     int nsat = 0;
 
     prev = NULL;
@@ -150,11 +138,9 @@ showsat(struct sky **skypp, int x, int 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);