Update copyright notice

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

diff --git a/src/lib/commands/sstat.c b/src/lib/commands/sstat.c
index e3949ca1faa64d0fafae22891f6a512016a6767d..f137c905dc55609d2256a80560a38523a6c841d9 100644 (file)
--- a/src/lib/commands/sstat.c
+++ b/src/lib/commands/sstat.c
@@ -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-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,85 +14,61 @@
  *  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.
  *
  *  ---
  *
  *  sstat.c: Show the stats of your ships
- * 
+ *
  *  Known contributors to this file:
  *     Steve McClure, 1996
  */
 
-#include "misc.h"
-#include "player.h"
-#include "var.h"
-#include "xy.h"
-#include "sect.h"
-#include "ship.h"
-#include "nat.h"
-#include "nsc.h"
-#include "deity.h"
-#include "file.h"
-#include "optlist.h"
+#include <config.h>
+
 #include "commands.h"
+#include "ship.h"
 
 int
 sstat(void)
 {
-       int     nships;
-       struct  nstr_item ni;
-       struct  shpstr ship;
-
-       if (!snxtitem(&ni, EF_SHIP, player->argp[1]))
-               return RET_SYN;
+    int nships;
+    struct nstr_item ni;
+    struct shpstr ship;
 
-       nships = 0;
-       while (nxtitem(&ni, (s_char *)&ship)) {
-               if (!player->owner || ship.shp_own == 0)
-                       continue;
-               if (ship.shp_type < 0 || ship.shp_type > shp_maxno) {
-                       pr("bad ship type %d (#%d)\n",
-                               ship.shp_type, ni.cur);
-                       continue;
-               }
-               count_planes(&ship);
-               count_units(&ship);
+    if (!snxtitem(&ni, EF_SHIP, player->argp[1], NULL))
+       return RET_SYN;
 
-               if (nships++ == 0) {
-pr("shp# %22.22s    x,y    eff  tech def spd vis rng fir\n", "ship-type");
-               }
-               pr("%4d %-22.22s ",
-                  ship.shp_uid,
-                  mchr[(int)ship.shp_type].m_name);
-               prxy("%4d,%-4d",
-                  ship.shp_x,
-                  ship.shp_y,
-                  player->cnum);
-               pr(" %3d%% %4d %3d %3d %3d %3d %3d",
-                  ship.shp_effic,
-                  ship.shp_tech,
-                  ship.shp_armor,
-                  ship.shp_speed,
-                  ship.shp_visib,
-                  ship.shp_frnge,
-                  ship.shp_glim);
-               pr("\n");
+    nships = 0;
+    while (nxtitem(&ni, &ship)) {
+       if (!player->owner || ship.shp_own == 0)
+           continue;
+       if (nships++ == 0) {
+           pr("shp# %22.22s    x,y    eff  tech def spd vis rng fir\n",
+              "ship-type");
        }
-       if (nships == 0) {
-               if (player->argp[1])
-                       pr("%s: No ship(s)\n", player->argp[1]);
-               else
-                       pr("%s: No ship(s)\n", "");
-               return RET_FAIL;
-       }else
-               pr("%d ship%s\n", nships, splur(nships));
-       return RET_OK;
+       pr("%4d %-22.22s ", ship.shp_uid, mchr[(int)ship.shp_type].m_name);
+       prxy("%4d,%-4d", ship.shp_x, ship.shp_y);
+       pr(" %3d%% %4d %3d %3d %3d %3d %3d",
+          ship.shp_effic,
+          ship.shp_tech,
+          shp_armor(&ship), shp_speed(&ship), shp_visib(&ship),
+          shp_frnge(&ship), shp_glim(&ship));
+       pr("\n");
+    }
+    if (nships == 0) {
+       if (player->argp[1])
+           pr("%s: No ship(s)\n", player->argp[1]);
+       else
+           pr("%s: No ship(s)\n", "");
+       return RET_FAIL;
+    } else
+       pr("%d ship%s\n", nships, splur(nships));
+    return RET_OK;
 }