commands: Rename the command functions

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

diff --git a/src/lib/commands/shi.c b/src/lib/commands/shi.c
index 1f0a1d8cbc80f0997a1fa5d6171c5a66258f7749..1397398af74b2fa9bdd5e28f0e6b7bd8a1e574fd 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-2009, 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,
@@ -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/>.
  *
  *  ---
  *
@@ -34,12 +33,10 @@
 #include <config.h>
 
 #include "commands.h"
-#include "land.h"
-#include "optlist.h"
 #include "ship.h"
 
 int
-shi(void)
+c_ship(void)
 {
     int nships, noff, npln, nch, nxl;
     struct nstr_item ni;
@@ -56,8 +53,7 @@ shi(void)
            if (player->god)
                pr("own ");
            pr("shp#     ship type       x,y   fl   eff civ mil  uw  fd pn"
-              " he xl ln mob");
-           pr(" tech\n");
+              " he xl ln mob tech\n");
        }
        if (ship.shp_off)
            noff++;
@@ -65,7 +61,7 @@ shi(void)
            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);
+       prxy("%4d,%-4d ", ship.shp_x, ship.shp_y);
        pr("%1.1s", &ship.shp_fleet);
        pr(" %c%3d%%", ship.shp_off ? '!' : ' ', ship.shp_effic);