Update copyright notice

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

diff --git a/src/lib/commands/thre.c b/src/lib/commands/thre.c
index b556872b97315bb9026e26a19aa4fda07eaca517..70290e6892ae492baca0539e30b4064d377ff9b7 100644 (file)
--- a/src/lib/commands/thre.c
+++ b/src/lib/commands/thre.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,28 +19,23 @@
  *
  *  ---
  *
- *  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 "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>
@@ -52,23 +47,18 @@ thre(void)
     struct nstr_sect nstr;
     int val;
     struct ichrstr *ip;
-    s_char *p;
+    char *p;
     int thresh;
     i_type type;
-    s_char prompt[128];
-    s_char buf[128];
+    char prompt[128];
+    char buf[128];
 
     if ((ip = whatitem(player->argp[1], "What commodity? ")) == 0)
        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];
@@ -82,11 +72,13 @@ thre(void)
                    dchr[sect.sct_type].d_name);
        if ((p = getstarg(player->argp[3], prompt, buf)) == 0)
            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)) {