/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
- * Ken Stevens, Steve McClure
+ * Copyright (C) 1986-2021, 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,
* 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/>.
*
* ---
*
- * 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.
*
* ---
*
* shi.c: Show a list of your ships
- *
+ *
* Known contributors to this file:
* Steve McClure, 2000
- *
*/
-#include "misc.h"
-#include "player.h"
-#include "var.h"
-#include "xy.h"
-#include "sect.h"
-#include "ship.h"
-#include "nat.h"
-#include "nsc.h"
-#include "deity.h"
-#include "file.h"
-#include "optlist.h"
+#include <config.h>
+
#include "commands.h"
+#include "ship.h"
int
-shi(void)
+c_ship(void)
{
- int nships;
- struct nstr_item ni;
- struct shpstr ship;
- int vec[I_MAX+1];
+ int nships, noff, npln, nch, nxl;
+ struct nstr_item ni;
+ struct shpstr ship;
- if (!snxtitem(&ni, EF_SHIP, player->argp[1]))
- return RET_SYN;
+ if (!snxtitem(&ni, EF_SHIP, player->argp[1], NULL))
+ return RET_SYN;
- nships = 0;
- while (nxtitem(&ni, (s_char *)&ship)) {
- if (!player->owner || ship.shp_own == 0)
- continue;
- if (ship.shp_type < 0 || ship.shp_type > shp_maxno) {
- pr("bad ship type %d (#%d)\n",
- ship.shp_type, ni.cur);
- 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");
- }
- 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);
+ nships = noff = 0;
+ while (nxtitem(&ni, &ship)) {
+ if (!player->owner || ship.shp_own == 0)
+ continue;
+ if (nships++ == 0) {
+ if (player->god)
+ pr("own ");
+ 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);
+ pr("%1.1s", &ship.shp_fleet);
+ pr(" %c%3d%%", ship.shp_off ? '!' : ' ', ship.shp_effic);
- getvec(VT_ITEM, vec, (s_char *)&ship, EF_SHIP);
- pr("%4d", vec[I_CIVIL]);
- pr("%4d", vec[I_MILIT]);
- pr("%4d", vec[I_UW]);
- pr("%4d", vec[I_FOOD]);
+ 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);
- pr("%4d", ship.shp_mobil);
- if (opt_FUEL)
- pr("%5d",ship.shp_fuel);
- pr("%5d\n", ship.shp_tech);
- if (opt_SHIPNAMES) {
- if (ship.shp_name[0] != 0) {
- if (player->god)
- pr(" ");
- pr(" %s\n",ship.shp_name);
- }
- }
+ 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);
+ pr("%5d\n", ship.shp_tech);
+ if (ship.shp_name[0] != 0) {
+ if (player->god)
+ pr(" ");
+ pr(" %s\n", ship.shp_name);
}
- if (nships == 0) {
- if (player->argp[1])
- pr("%s: No ship(s)\n", player->argp[1]);
- else
- pr("%s: No ship(s)\n", "");
- return RET_FAIL;
- }else
- pr("%d ship%s\n", nships, splur(nships));
- return RET_OK;
+ }
+ if (nships == 0) {
+ if (player->argp[1])
+ pr("%s: No ship(s)\n", player->argp[1]);
+ else
+ pr("%s: No ship(s)\n", "");
+ return RET_FAIL;
+ } else {
+ pr("%d ship%s", nships, splur(nships));
+ if (noff)
+ pr(", %d stopped (eff marked with !)", noff);
+ pr("\n");
+ }
+ return RET_OK;
}
projects / empserver / blobdiff