commands: Rename the command functions

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

diff --git a/src/lib/commands/show.c b/src/lib/commands/show.c
index 71b57c12e4c872f1395b7bc4cfd3548aa4faaf42..5addc64b0a41f661466b08ff61793335d1baebed 100644 (file)
--- a/src/lib/commands/show.c
+++ b/src/lib/commands/show.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,7 +25,7 @@
  *  ---
  *
  *  show.c: Give info on empire objects, planes, boats, nukes, etc.
- * 
+ *
  *  Known contributors to this file:
  *     Julian Onions, 1988
  *     Steve McClure, 1997
@@ -39,7 +38,7 @@
 #include "optlist.h"
 
 int
-show(void)
+c_show(void)
 {
     char *p;
     void (*cfunc)(int);
@@ -50,11 +49,14 @@ show(void)
     char buf[1024];
     int rlev;
 
-    if (!(p = getstarg(player->argp[1],
-                      "Show what (bridge, item, land, nuke, plane, sect, ship, tower, updates)?",
-                      buf))
-       || !*p)
+again:
+    p = getstarg(player->argp[1], "Show what ('?' to list options)? ", buf);
+    if (!p || !*p)
        return RET_SYN;
+    if (*p == '?') {
+       pr("bridge, item, land, news, nuke, plane, sect, ship, product, tower, updates\n");
+       goto again;
+    }
 
     natp = getnatp(player->cnum);
     rlev = (int)(1.25 * natp->nat_level[NAT_RLEV]);
@@ -98,6 +100,10 @@ show(void)
        cfunc = show_land_capab;
        break;
     case 'p':
+       if (p[1] == 'r') {
+           show_product(99999);
+           return RET_OK;
+       }
        bfunc = show_plane_build;
        sfunc = show_plane_stats;
        cfunc = show_plane_capab;
@@ -120,9 +126,9 @@ show(void)
        return RET_SYN;
     }
 
-    if (!(p = getstarg(player->argp[2],
-                      "Build, stats, or capability data (b,s,c)? ", buf))
-       || !*p)
+    p = getstarg(player->argp[2],
+                "Build, stats, or capability data (b,s,c)? ", buf);
+    if (!p || !*p)
        return RET_SYN;
     pr("Printing for tech level '%d'\n", tlev);
     if (*p == 'B' || *p == 'b')