commands: Rename the command functions

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

diff --git a/src/lib/commands/thre.c b/src/lib/commands/thre.c
index 5def538fe0b171a1b1cc3591f10d9b5f37ec3aea..d52fb2b4952fc338f15783da2dc4b5026f1c1288 100644 (file)
--- a/src/lib/commands/thre.c
+++ b/src/lib/commands/thre.c
@@ -1,11 +1,11 @@
 /*
  *  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,
@@ -14,62 +14,50 @@
  *  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.
  *
  *  ---
  *
  *  thre.c: Describe/set threshold for given commodity
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1986
  *     Steve McClure, 1998
  */
 
-#include "misc.h"
-#include "player.h"
-#include "var.h"
-#include "sect.h"
-#include "xy.h"
-#include "item.h"
-#include "nsc.h"
-#include "nat.h"
-#include "file.h"
+#include <config.h>
+
 #include "commands.h"
+#include "item.h"
 
 /*
  * threshold <COMM> <SECTS> <THRESH>
  */
 int
-thre(void)
+c_threshold(void)
 {
     struct sctstr sect;
     struct nstr_sect nstr;
     int val;
     struct ichrstr *ip;
-    s_char *p;
+    char *p;
     int thresh;
-    int type;
-    s_char prompt[128];
-    s_char buf[128];
+    i_type type;
+    char prompt[128];
+    char buf[128];
 
-    if ((ip = whatitem(player->argp[1], "What commodity? ")) == 0)
+    if (!(ip = whatitem(player->argp[1], "What commodity? ")))
        return RET_SYN;
     if (!snxtsct(&nstr, player->argp[2]))
        return RET_SYN;
-    type = ip->i_vtype;
-    if (player->argp[3] && *player->argp[3] &&
-       (*player->argp[3] < '0' || *player->argp[3] > '9')) {
-       pr("Threshold must be a number\n");
-       return RET_SYN;
-    }
-    while (!player->aborted && nxtsct(&nstr, &sect)) {
+    type = ip->i_uid;
+    while (nxtsct(&nstr, &sect)) {
        if (!player->owner)
            continue;
        val = sect.sct_dist[type];
@@ -81,13 +69,15 @@ thre(void)
            sprintf(prompt, "%s %s  threshold? ",
                    xyas(nstr.x, nstr.y, player->cnum),
                    dchr[sect.sct_type].d_name);
-       if ((p = getstarg(player->argp[3], prompt, buf)) == 0)
+       if (!(p = getstarg(player->argp[3], prompt, buf)))
            return RET_FAIL;
+       if (!*p)
+           continue;
        if (!check_sect_ok(&sect))
            return RET_FAIL;
-       if (*p == '\0' || *p == '-')
-           continue;
        thresh = atoi(p);
+       if (thresh < 0)
+           return RET_FAIL;
        if (thresh > ITEM_MAX)
            thresh = ITEM_MAX;
        if ((val > 0) && (val == thresh)) {
@@ -95,7 +85,7 @@ thre(void)
               xyas(nstr.x, nstr.y, player->cnum), val);
            continue;
        }
-       if (val > 0 && (player->argp[3] != 0 && *player->argp[3] != 0))
+       if (val > 0 && player->argp[3] && *player->argp[3])
            pr("%s old threshold %d\n",
               xyas(nstr.x, nstr.y, player->cnum), val);
        sect.sct_dist[type] = thresh;