Fix trailing whitespace

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

diff --git a/src/lib/commands/plan.c b/src/lib/commands/plan.c
index 69c883a8cdf082f545646c55698d0f47ee6e0a1e..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-2006, 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
@@ -26,23 +26,19 @@
  *  ---
  *
  *  plan.c: Do a plane report
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1986
  *     Steve McClure, 2000
- *     Markus Armbruster, 2006
+ *     Markus Armbruster, 2006-2008
  */
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "plane.h"
-#include "nsc.h"
+#include "commands.h"
 #include "nuke.h"
-#include "file.h"
 #include "optlist.h"
-#include "commands.h"
+#include "plane.h"
 
 int
 plan(void)
@@ -50,8 +46,9 @@ plan(void)
     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 = noff = 0;
     while (nxtitem(&np, &plane)) {
@@ -70,7 +67,7 @@ plan(void)
        prxy("%4d,%-4d", plane.pln_x, plane.pln_y, player->cnum);
        pr(" %1.1s %c%3d%% %3d %3d %4d %3d  %3d",
           &plane.pln_wing, plane.pln_off ? '!' : ' ', plane.pln_effic,
-          plane.pln_mobil, plane.pln_def, plane.pln_tech,
+          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);
@@ -78,13 +75,11 @@ plan(void)
            pr("%5dL", plane.pln_land);
        else
            pr("      ");
-       if (plane.pln_flags & PLN_SYNCHRONOUS)
-           pr(" geosync");
-       else if (plane.pln_flags & PLN_LAUNCHED)
-           pr(" orbit");
-       else if (plane.pln_nuketype >= 0)
+       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[(int)plane.pln_nuketype].n_name,
+              nchr[nuke.nuk_type].n_name,
               plane.pln_flags & PLN_AIRBURST ? 'A' : 'G');
        pr("\n");
     }