Update copyright notice

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

diff --git a/src/lib/commands/shi.c b/src/lib/commands/shi.c
index e47e178c73c3a14cbf090892b34c664eb63989a1..ac1ba44404ee12ac7069551caa995d7274627337 100644 (file)
--- a/src/lib/commands/shi.c
+++ b/src/lib/commands/shi.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2014, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
@@ -26,70 +25,55 @@
  *  ---
  *
  *  shi.c: Show a list of your ships
- * 
+ *
  *  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 "ship.h"
 
 int
 shi(void)
 {
-    int nships;
+    int nships, noff, npln, nch, nxl;
     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;
+    nships = noff = 0;
     while (nxtitem(&ni, &ship)) {
        if (!player->owner || ship.shp_own == 0)
            continue;
-       count_planes(&ship);
-       count_units(&ship);
        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");
-           if (opt_FUEL)
-               pr(" fuel");
-           pr(" tech\n");
+           pr("shp#     ship type       x,y   fl   eff civ mil  uw  fd pn"
+              " he xl ln mob 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("%c", ship.shp_fleet);
-       pr("%4d%%", ship.shp_effic);
+       prxy("%4d,%-4d ", ship.shp_x, ship.shp_y);
+       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]);
        pr("%4d", ship.shp_item[I_UW]);
        pr("%4d", ship.shp_item[I_FOOD]);
 
-       pr("%3d", ship.shp_nplane);
-       pr("%3d", ship.shp_nchoppers);
-       pr("%3d", ship.shp_nxlight);
-       pr("%3d", ship.shp_nland);
+       npln = shp_nplane(&ship, &nch, &nxl, NULL);
+       pr("%3d%3d%3d", npln - nch - nxl, nch, nxl);
+       pr("%3d", shp_nland(&ship));
        pr("%4d", ship.shp_mobil);
-       if (opt_FUEL)
-           pr("%5d", ship.shp_fuel);
        pr("%5d\n", ship.shp_tech);
        if (ship.shp_name[0] != 0) {
            if (player->god)
@@ -103,7 +87,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;
 }