Update copyright notice

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

diff --git a/src/lib/commands/coas.c b/src/lib/commands/coas.c
index 909ee09e8e306c0b9bd3ee145d0e059d8109e164..46e34c815f3dc05643e2cba440fa8dfa10d6339b 100644 (file)
--- a/src/lib/commands/coas.c
+++ b/src/lib/commands/coas.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2012, 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,36 +14,31 @@
  *  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/>.
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
  *  coas.c: Look at all the ships in the world
- * 
+ *
  *  Known contributors to this file:
  *     Keith Muller, 1983
  *     Dave Pare, 1986 (rewrite)
+ *     Markus Armbruster, 2010
  */
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "ship.h"
-#include "nat.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
+#include <config.h>
+
 #include "commands.h"
 #include "optlist.h"
+#include "ship.h"
 
-#define        TSIZE   200
+#define TSIZE  200
 
 struct coast {
     struct coast *c_next;
@@ -64,21 +59,20 @@ coas(void)
     struct nstr_sect nstr;
     struct coast *cp;
     struct coast *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 nship = 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;
-    cp = (struct coast *)malloc(sizeof(*cp));
+       list[i] = NULL;
+    cp = malloc(sizeof(*cp));
     snxtitem_all(&ni, EF_SHIP);
-    while (nxtitem(&ni, (s_char *)&cp->c_shp)) {
+    while (nxtitem(&ni, &cp->c_shp)) {
        if (cp->c_shp.shp_own == 0 || cp->c_shp.shp_own == player->cnum)
            continue;
        /*
@@ -94,11 +88,11 @@ coas(void)
        cp->c_number = i;
        cp->c_next = list[n];
        list[n] = cp;
-       cp = (struct coast *)malloc(sizeof(*cp));
+       cp = malloc(sizeof(*cp));
        nship++;
     }
     /* get that last one! */
-    free((s_char *)cp);
+    free(cp);
     pr("- = [ Coastwatch report for %s ] = -\n", cname(player->cnum));
     pr("  Country            Ship          Location\n");
     tech = tfact(player->cnum, 1.0);
@@ -109,22 +103,13 @@ coas(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 && nship; j++) {
-           x = xnorm(sect.sct_x + j);
-           for (k = mink; k <= maxk && nship; 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] == 0)
+               if (!list[n])
                    continue;
                nship -= showship(&list[n], x, y);
            }
@@ -134,7 +119,7 @@ coas(void)
     for (i = 0; i < TSIZE; i++) {
        while (NULL != (cp = list[i])) {
            list[i] = cp->c_next;
-           free((s_char *)cp);
+           free(cp);
        }
     }
     return RET_OK;
@@ -144,18 +129,18 @@ static int
 showship(struct coast **cpp, int x, int y)
 {
     struct coast *cp;
-    struct coast *todelete = 0;
+    struct coast *todelete = NULL;
     struct coast **prev;
     int nship = 0;
 
-    prev = 0;
+    prev = NULL;
     cp = *cpp;
     prev = cpp;
     do {
        /* we delete it, we free it. */
        if (todelete) {
-           free((s_char *)todelete);
-           todelete = 0;
+           free(todelete);
+           todelete = NULL;
        }
        if (cp->c_shp.shp_x != x || cp->c_shp.shp_y != y) {
            prev = &(*prev)->c_next;
@@ -173,6 +158,6 @@ showship(struct coast **cpp, int x, int y)
     } while (NULL != (cp = cp->c_next));
     /* check that last one! */
     if (todelete)
-       free((s_char *)todelete);
-    return (nship);
+       free(todelete);
+    return nship;
 }