]> git.pond.sub.org Git - empserver/blobdiff - src/lib/commands/coas.c
Update copyright notice
[empserver] / src / lib / commands / coas.c
index fab689ae880589d84d8ec9cf8682532166394cb4..d8a2dc190b69edc711c3e82b4c31dd6b076b9764 100644 (file)
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2013, 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,
  *  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 "var.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;
-       int c_spotted;
-       int c_number;
-       struct shpstr c_shp;
+    struct coast *c_next;
+    int c_spotted;
+    int c_number;
+    struct shpstr c_shp;
 };
 
-static int showship(struct coast **cpp, int x, int y);
+static int showship(struct coast **cpp, int x, int y);
 
 /*
  * format: coastwatch [<SECTS>]
@@ -61,119 +55,109 @@ static    int showship(struct coast **cpp, int x, int y);
 int
 coas(void)
 {
-       struct sctstr sect;
-       struct nstr_sect nstr;
-       struct coast *cp;
-       struct coast *list[TSIZE];
-       int i, k, j, n;
-       int vrange, see;
-       int x, y;
-       int mink, minj, maxk, maxj;
-       int nship = 0;
-       float tech;
-       struct  nstr_item ni;
+    struct sctstr sect;
+    struct nstr_sect nstr;
+    struct coast *cp;
+    struct coast *list[TSIZE];
+    int i, n;
+    int vrange, see;
+    int x, y, dx, dy, dxmax;
+    int nship = 0;
+    double tech;
+    struct nstr_item ni;
 
-       if (snxtsct(&nstr, player->argp[1]) == 0)
-               return RET_SYN;
-       for (i = 0; i < TSIZE; i++)
-               list[i] = 0;
-       cp = (struct coast *)malloc(sizeof(*cp));
-       snxtitem_all(&ni, EF_SHIP);
-       while (nxtitem(&ni, (s_char *) &cp->c_shp)) {
-               if (cp->c_shp.shp_own == 0 || cp->c_shp.shp_own == player->cnum)
-                       continue;
-               /*
-                * don't bother putting subs in the table...
-                * unless they're in a sector you own (harbor or such)
-                */
-               getsect(cp->c_shp.shp_x, cp->c_shp.shp_y, &sect);
-               if ((mchr[(int)cp->c_shp.shp_type].m_flags & M_SUB) && 
-                       (sect.sct_own != player->cnum))
-                       continue;
-               n = scthash(cp->c_shp.shp_x, cp->c_shp.shp_y, TSIZE);
-               cp->c_spotted = 0;
-               cp->c_number = i;
-               cp->c_next = list[n];
-               list[n] = cp;
-               cp = (struct coast *)malloc(sizeof(*cp));
-               nship++;
+    if (!snxtsct(&nstr, player->argp[1]))
+       return RET_SYN;
+    for (i = 0; i < TSIZE; i++)
+       list[i] = NULL;
+    cp = malloc(sizeof(*cp));
+    snxtitem_all(&ni, EF_SHIP);
+    while (nxtitem(&ni, &cp->c_shp)) {
+       if (cp->c_shp.shp_own == 0 || cp->c_shp.shp_own == player->cnum)
+           continue;
+       /*
+        * don't bother putting subs in the table...
+        * unless they're in a sector you own (harbor or such)
+        */
+       getsect(cp->c_shp.shp_x, cp->c_shp.shp_y, &sect);
+       if ((mchr[(int)cp->c_shp.shp_type].m_flags & M_SUB) &&
+           (sect.sct_own != player->cnum))
+           continue;
+       n = scthash(cp->c_shp.shp_x, cp->c_shp.shp_y, TSIZE);
+       cp->c_spotted = 0;
+       cp->c_number = i;
+       cp->c_next = list[n];
+       list[n] = cp;
+       cp = malloc(sizeof(*cp));
+       nship++;
+    }
+    /* get that last one! */
+    free(cp);
+    pr("- = [ Coastwatch report for %s ] = -\n", cname(player->cnum));
+    pr("  Country            Ship          Location\n");
+    tech = tfact(player->cnum, 1.0);
+    while (nxtsct(&nstr, &sect) && nship) {
+       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;
+       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;
+               nship -= showship(&list[n], x, y);
+           }
        }
-       /* get that last one! */
-       free((s_char *)cp);
-       pr("- = [ Coastwatch report for %s ] = -\n", cname(player->cnum));
-       pr("  Country            Ship          Location\n");
-       tech = tfact(player->cnum, 1.0);
-       while (nxtsct(&nstr, &sect) && nship) {
-               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 && 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);
-                               n = scthash(x, y, TSIZE);
-                               if (list[n] == 0)
-                                       continue;
-                               nship -= showship(&list[n], x, y);
-                       }
-               }
+    }
+    /* free up the coast structs calloc'ed above */
+    for (i = 0; i < TSIZE; i++) {
+       while (NULL != (cp = list[i])) {
+           list[i] = cp->c_next;
+           free(cp);
        }
-       /* free up the coast structs calloc'ed above */
-       for (i = 0; i < TSIZE; i++) {
-               while (NULL != (cp = list[i])) {
-                       list[i] = cp->c_next;
-                       free((s_char *)cp);
-               }
-       }
-       return RET_OK;
+    }
+    return RET_OK;
 }
 
 static int
 showship(struct coast **cpp, int x, int y)
 {
-       register struct coast *cp;
-       register struct coast *todelete = 0;
-       register struct coast **prev;
-       int     nship = 0;
+    struct coast *cp;
+    struct coast *todelete = NULL;
+    struct coast **prev;
+    int nship = 0;
 
-       prev = 0;
-       cp = *cpp;
-       prev = cpp;
-       do {
-               /* we delete it, we free it. */
-               if (todelete) {
-                       free((s_char *)todelete);
-                       todelete = 0;
-               }
-               if (cp->c_shp.shp_x != x || cp->c_shp.shp_y != y) {
-                       prev = &(*prev)->c_next;
-                       continue;
-               }
-               pr(" %12.12s (#%3d) %s @ %s\n",
-                  cname(cp->c_shp.shp_own), cp->c_shp.shp_own,
-                  prship(&cp->c_shp), xyas(x, y, player->cnum));
-               if (opt_HIDDEN) {
-                   setcont(player->cnum, cp->c_shp.shp_own, FOUND_COAST);
-               }
-               *prev = cp->c_next;
-               todelete = cp;
-               nship++;
-       } while (NULL != (cp = cp->c_next));
-       /* check that last one! */
-       if (todelete)
-               free((s_char *)todelete);
-       return (nship);
+    prev = NULL;
+    cp = *cpp;
+    prev = cpp;
+    do {
+       /* we delete it, we free it. */
+       if (todelete) {
+           free(todelete);
+           todelete = NULL;
+       }
+       if (cp->c_shp.shp_x != x || cp->c_shp.shp_y != y) {
+           prev = &(*prev)->c_next;
+           continue;
+       }
+       pr(" %12.12s (#%3d) %s @ %s\n",
+          cname(cp->c_shp.shp_own), cp->c_shp.shp_own,
+          prship(&cp->c_shp), xyas(x, y, player->cnum));
+       if (opt_HIDDEN) {
+           setcont(player->cnum, cp->c_shp.shp_own, FOUND_COAST);
+       }
+       *prev = cp->c_next;
+       todelete = cp;
+       nship++;
+    } while (NULL != (cp = cp->c_next));
+    /* check that last one! */
+    if (todelete)
+       free(todelete);
+    return nship;
 }