/*
* 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-2015, 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/>.
*
* ---
*
* ---
*
* thre.c: Describe/set threshold for given commodity
- *
+ *
* Known contributors to this file:
* Dave Pare, 1986
* Steve McClure, 1998
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_uid;
- 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, §)) {
+ while (nxtsct(&nstr, §)) {
if (!player->owner)
continue;
val = sect.sct_dist[type];
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(§))
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)) {
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;