Fix trailing whitespace

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

diff --git a/src/lib/commands/plan.c b/src/lib/commands/plan.c
index 6436687ae0b16f36f455ea1e3eb3d15ab192e66e..b42c1b9838f83d0b984e4b93c3fd779638bd27fa 100644 (file)
--- a/src/lib/commands/plan.c
+++ b/src/lib/commands/plan.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,54 +19,55 @@
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
  *  plan.c: Do a plane report
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1986
  *     Steve McClure, 2000
+ *     Markus Armbruster, 2006-2008
  */
 
-#include "misc.h"
-#include "player.h"
-#include "plane.h"
-#include "nsc.h"
+#include <config.h>
+
+#include "commands.h"
 #include "nuke.h"
-#include "file.h"
 #include "optlist.h"
-#include "commands.h"
+#include "plane.h"
 
 int
 plan(void)
 {
-    int nplanes;
+    int nplanes, noff;
     struct nstr_item np;
     struct plnstr plane;
+    struct nukstr nuke;
 
-    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)) {
+    nplanes = noff = 0;
+    while (nxtitem(&np, &plane)) {
        if (!player->owner || plane.pln_own == 0)
            continue;
        if (nplanes++ == 0) {
            if (player->god)
                pr("own ");
-           pr("   #    type                x,y    w  eff  mu def tech ran hard   s/l LSB nuke\n");
+           pr("   #    type                x,y    w   eff  mu def tech ran hard carry special\n");
        }
+       if (plane.pln_off)
+           noff++;
        if (player->god)
            pr("%3d ", plane.pln_own);
        pr("%4d %-19.19s ", np.cur, plchr[(int)plane.pln_type].pl_name);
        prxy("%4d,%-4d", plane.pln_x, plane.pln_y, player->cnum);
-       pr(" %c %3d%% %3d %3d %4d %3d  %3d",
-          plane.pln_wing, plane.pln_effic,
-          plane.pln_mobil,
-          plane.pln_def, plane.pln_tech,
+       pr(" %1.1s %c%3d%% %3d %3d %4d %3d  %3d",
+          &plane.pln_wing, plane.pln_off ? '!' : ' ', plane.pln_effic,
+          plane.pln_mobil, pln_def(&plane), plane.pln_tech,
           plane.pln_range, plane.pln_harden);
        if (plane.pln_ship >= 0)
            pr("%5dS", plane.pln_ship);
@@ -74,15 +75,12 @@ plan(void)
            pr("%5dL", plane.pln_land);
        else
            pr("      ");
-       if ((plchr[(int)plane.pln_type].pl_flags & (P_O | P_M)) == P_O) {
-           pr(" %c", (plane.pln_flags & PLN_LAUNCHED) ? 'Y' : 'N');
-           pr("%c", (plane.pln_flags & PLN_SYNCHRONOUS) ? 'Y' : 'N');
-       } else
-           pr("  ");
-       if (plane.pln_nuketype != -1)
-           pr(" %c %-5.5s",
-              plane.pln_flags & PLN_AIRBURST ? 'A' : 'G',
-              nchr[(int)plane.pln_nuketype].n_name);
+       if (pln_is_in_orbit(&plane))
+           pr((plane.pln_flags & PLN_SYNCHRONOUS) ? " geosync" : " orbit");
+       else if (getnuke(nuk_on_plane(&plane), &nuke))
+           pr(" %-5.5s %c",
+              nchr[nuke.nuk_type].n_name,
+              plane.pln_flags & PLN_AIRBURST ? 'A' : 'G');
        pr("\n");
     }
 
@@ -92,8 +90,12 @@ plan(void)
        else
            pr("%s: No plane(s)\n", "");
        return RET_FAIL;
-    } else
-       pr("%d plane%s\n", nplanes, splur(nplanes));
+    } else {
+       pr("%d plane%s", nplanes, splur(nplanes));
+       if (noff)
+           pr(", %d stopped (eff marked with !)", noff);
+       pr("\n");
+    }
 
     return RET_OK;
 }