* ---
*
* 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>
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)) {
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);
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");
}