Update copyright notice.

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

diff --git a/src/lib/commands/shi.c b/src/lib/commands/shi.c
index 2b9c8eff646f77d731f2de2d2aa70d09ec4cccbf..d61c2eed330181857ce0b4ceb2bfa39369f32fa0 100644 (file)
--- a/src/lib/commands/shi.c
+++ b/src/lib/commands/shi.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-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,9 +19,9 @@
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
@@ -29,31 +29,26 @@
  * 
  *  Known contributors to this file:
  *     Steve McClure, 2000
- *     
  */
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "ship.h"
-#include "nsc.h"
-#include "file.h"
-#include "optlist.h"
 #include "commands.h"
+#include "land.h"
+#include "optlist.h"
+#include "ship.h"
 
 int
 shi(void)
 {
-    int nships;
+    int nships, noff;
     struct nstr_item ni;
     struct shpstr ship;
 
     if (!snxtitem(&ni, EF_SHIP, player->argp[1]))
        return RET_SYN;
 
-    nships = 0;
+    nships = noff = 0;
     while (nxtitem(&ni, &ship)) {
        if (!player->owner || ship.shp_own == 0)
            continue;
@@ -62,22 +57,21 @@ shi(void)
        if (nships++ == 0) {
            if (player->god)
                pr("own ");
-           pr("shp#     ship type       x,y   fl  eff civ mil  uw  fd pn");
-           pr(" he");
-           pr(" xl");
-           pr(" ln");
-           pr(" mob");
+           pr("shp#     ship type       x,y   fl   eff civ mil  uw  fd pn"
+              " he xl ln mob");
            if (opt_FUEL)
                pr(" fuel");
            pr(" tech\n");
        }
+       if (ship.shp_off)
+           noff++;
        if (player->god)
            pr("%3d ", ship.shp_own);
        pr("%4d ", ni.cur);
        pr("%-16.16s ", mchr[(int)ship.shp_type].m_name);
        prxy("%4d,%-4d ", ship.shp_x, ship.shp_y, player->cnum);
-       pr("%1c", ship.shp_fleet);
-       pr("%4d%%", ship.shp_effic);
+       pr("%1.1s", &ship.shp_fleet);
+       pr(" %c%3d%%", ship.shp_off ? '!' : ' ', ship.shp_effic);
 
        pr("%4d", ship.shp_item[I_CIVIL]);
        pr("%4d", ship.shp_item[I_MILIT]);
@@ -104,7 +98,11 @@ shi(void)
        else
            pr("%s: No ship(s)\n", "");
        return RET_FAIL;
-    } else
-       pr("%d ship%s\n", nships, splur(nships));
+    } else {
+       pr("%d ship%s", nships, splur(nships));
+       if (noff)
+           pr(", %d stopped (eff marked with !)", noff);
+       pr("\n");
+    }
     return RET_OK;
 }