Update copyright notice

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

diff --git a/src/lib/commands/coas.c b/src/lib/commands/coas.c
index cf2df2afd5338e55d9dcbcf0cea0c311d357db12..174b5406f00349711c2c7c52db51d4550a059900 100644 (file)
--- a/src/lib/commands/coas.c
+++ b/src/lib/commands/coas.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2009, 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,24 @@
  *
  *  ---
  *
- *  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)
  */
 
-#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
 
@@ -69,16 +64,16 @@ coas(void)
     int x, y;
     int mink, minj, maxk, maxj;
     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));
+    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 +89,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);
@@ -134,7 +129,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;
@@ -154,7 +149,7 @@ showship(struct coast **cpp, int x, int y)
     do {
        /* we delete it, we free it. */
        if (todelete) {
-           free((s_char *)todelete);
+           free(todelete);
            todelete = 0;
        }
        if (cp->c_shp.shp_x != x || cp->c_shp.shp_y != y) {
@@ -173,6 +168,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;
 }