Fix trailing whitespace

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

diff --git a/src/lib/commands/carg.c b/src/lib/commands/carg.c
index 19cd210fc6c0a37723bd4771fc4dc7b27339ceab..21d14584c36096f9b7659c042f407b8849aa8ec6 100644 (file)
--- a/src/lib/commands/carg.c
+++ b/src/lib/commands/carg.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,22 +26,17 @@
  *  ---
  *
  *  carg.c: List cargo contents of a ship
- * 
+ *
  *  Known contributors to this file:
- *     
+ *
  */
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "ship.h"
-#include "land.h"
-#include "nsc.h"
-#include "file.h"
 #include "commands.h"
+#include "land.h"
 #include "optlist.h"
+#include "ship.h"
 
 int
 carg(void)
@@ -50,7 +45,7 @@ carg(void)
     struct nstr_item ni;
     struct shpstr ship;
 
-    if (!snxtitem(&ni, EF_SHIP, player->argp[1]))
+    if (!snxtitem(&ni, EF_SHIP, player->argp[1], NULL))
        return RET_SYN;
     nships = 0;
     while (nxtitem(&ni, &ship)) {
@@ -59,12 +54,15 @@ carg(void)
        if ((player->cnum != ship.shp_own) && !player->god)
            continue;
        if (nships++ == 0)
-           pr("shp# ship type           x,y   flt  eff  sh gun pet irn dst bar oil lcm hcm rad\n");
+           pr("shp#         x,y   flt eff  civ mil  uw  sh gun pet irn dst bar oil lcm hcm rad\n");
        pr("%4d ", ni.cur);
-       pr("%-16.16s ", mchr[(int)ship.shp_type].m_name);
+       pr("%-4.4s ", mchr[(int)ship.shp_type].m_name);
        prxy("%4d,%-4d ", ship.shp_x, ship.shp_y, player->cnum);
-       pr(" %c", ship.shp_fleet);
+       pr("%1.1s", &ship.shp_fleet);
        pr("%4d%%", ship.shp_effic);
+       pr("%4d", ship.shp_item[I_CIVIL]);
+       pr("%4d", ship.shp_item[I_MILIT]);
+       pr("%4d", ship.shp_item[I_UW]);
        pr("%4d", ship.shp_item[I_SHELL]);
        pr("%4d", ship.shp_item[I_GUN]);
        pr("%4d", ship.shp_item[I_PETROL]);
@@ -96,7 +94,7 @@ lcarg(void)
     struct nstr_item ni;
     struct lndstr land;
 
-    if (!snxtitem(&ni, EF_LAND, player->argp[1]))
+    if (!snxtitem(&ni, EF_LAND, player->argp[1], NULL))
        return RET_SYN;
     nunits = 0;
     while (nxtitem(&ni, &land)) {
@@ -105,12 +103,15 @@ lcarg(void)
        if ((player->cnum != land.lnd_own) && !player->god)
            continue;
        if (nunits++ == 0)
-           pr("lnd# unit type           x,y     a  eff  sh gun pet irn dst bar oil lcm hcm rad\n");
+           pr("lnd# unit    x,y    a  eff  civ mil  uw  sh gun pet irn dst bar oil lcm hcm rad\n");
        pr("%4d ", ni.cur);
-       pr("%-16.16s ", lchr[(int)land.lnd_type].l_name);
+       pr("%-4.4s ", lchr[(int)land.lnd_type].l_name);
        prxy("%4d,%-4d ", land.lnd_x, land.lnd_y, player->cnum);
-       pr(" %c", land.lnd_army);
+       pr("%1.1s ", &land.lnd_army);
        pr("%4d%%", land.lnd_effic);
+       pr("%4d", land.lnd_item[I_CIVIL]);
+       pr("%4d", land.lnd_item[I_MILIT]);
+       pr("%4d", land.lnd_item[I_UW]);
        pr("%4d", land.lnd_item[I_SHELL]);
        pr("%4d", land.lnd_item[I_GUN]);
        pr("%4d", land.lnd_item[I_PETROL]);