Fix trailing whitespace

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

diff --git a/src/lib/commands/pstat.c b/src/lib/commands/pstat.c
index d768353e816f15dcfe573933b4fa0138780ceabd..6bfe33511455315201f3ac8ff23a506f3fa013a6 100644 (file)
--- a/src/lib/commands/pstat.c
+++ b/src/lib/commands/pstat.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,25 +19,22 @@
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
  *  pstat.c: Show the stats of your planes
- * 
+ *
  *  Known contributors to this file:
  *     Steve McClure, 1996
  */
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "plane.h"
-#include "nsc.h"
-#include "file.h"
+#include <config.h>
+
 #include "commands.h"
+#include "plane.h"
 
 int
 pstat(void)
@@ -46,16 +43,12 @@ pstat(void)
     struct nstr_item np;
     struct plnstr plane;
 
-    if (!snxtitem(&np, EF_PLANE, player->argp[1]))
+    if (!snxtitem(&np, EF_PLANE, player->argp[1], NULL))
        return RET_SYN;
     nplanes = 0;
-    while (nxtitem(&np, (s_char *)&plane)) {
+    while (nxtitem(&np, &plane)) {
        if (!player->owner || plane.pln_own == 0)
            continue;
-       if (plane.pln_type < 0 || plane.pln_type > pln_maxno) {
-           pr("bad plane type %d (#%d)\n", plane.pln_type, np.cur);
-           continue;
-       }
        if (nplanes++ == 0) {
            pr("pln# %22.22s    x,y    eff  tech att def acc ran load fuel\n", "plane-type");
        }
@@ -65,10 +58,10 @@ pstat(void)
        pr(" %3d%% %4d %3d %3d %3d %3d %4d %4d",
           plane.pln_effic,
           plane.pln_tech,
-          plane.pln_att,
-          plane.pln_def,
-          plane.pln_acc,
-          plane.pln_range_max, plane.pln_load,
+          pln_att(&plane),
+          pln_def(&plane),
+          pln_acc(&plane),
+          pln_range_max(&plane), pln_load(&plane),
           plchr[(int)plane.pln_type].pl_fuel);
        pr("\n");
     }