commands: Rename the command functions

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

diff --git a/src/lib/commands/carg.c b/src/lib/commands/carg.c
index 97736e431a53c026f00ab6e0ff180d159455d118..dcad074b3c363be912a89ca587a210bebfd295a0 100644 (file)
--- a/src/lib/commands/carg.c
+++ b/src/lib/commands/carg.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2007, 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/>.
  *
  *  ---
  *
@@ -26,26 +25,25 @@
  *  ---
  *
  *  carg.c: List cargo contents of a ship
- * 
+ *
  *  Known contributors to this file:
- *     
+ *
  */
 
 #include <config.h>
 
 #include "commands.h"
 #include "land.h"
-#include "optlist.h"
 #include "ship.h"
 
 int
-carg(void)
+c_cargo(void)
 {
     int nships;
     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)) {
@@ -57,7 +55,7 @@ carg(void)
            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("%-4.4s ", 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("%4d%%", ship.shp_effic);
        pr("%4d", ship.shp_item[I_CIVIL]);
@@ -88,13 +86,13 @@ carg(void)
 }
 
 int
-lcarg(void)
+c_lcargo(void)
 {
     int nunits;
     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)) {
@@ -106,7 +104,7 @@ lcarg(void)
            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("%-4.4s ", lchr[(int)land.lnd_type].l_name);
-       prxy("%4d,%-4d ", land.lnd_x, land.lnd_y, player->cnum);
+       prxy("%4d,%-4d ", land.lnd_x, land.lnd_y);
        pr("%1.1s ", &land.lnd_army);
        pr("%4d%%", land.lnd_effic);
        pr("%4d", land.lnd_item[I_CIVIL]);