License upgrade to GPL version 3 or later

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

diff --git a/src/lib/commands/setres.c b/src/lib/commands/setres.c
index 6200c08a36bb7513ba9585ed43e1be0d39566349..d6c5831b191f57c194e812a80df7f4c927f5ccba 100644 (file)
--- a/src/lib/commands/setres.c
+++ b/src/lib/commands/setres.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2011, 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,39 +14,27 @@
  *  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.
  *
  *  ---
  *
  *  setres.c: Set resources of a sector
- * 
+ *
  *  Known contributors to this file:
  *     David Muir Sharnoff
  *     Karl Hagen
  *     Steve McClure, 1998
  */
 
-#include <stdio.h>
-#include <ctype.h>
-#include "misc.h"
-#include "player.h"
-#include "var.h"
-#include "xy.h"
-#include "sect.h"
-#include "nat.h"
-#include "news.h"
-#include "nsc.h"
-#include "item.h"
-#include "file.h"
+#include <config.h>
+
 #include "commands.h"
-#include "optlist.h"
 
 /*
  * format: setres resource <amt>  <sect>
@@ -55,23 +43,24 @@ int
 setres(void)
 {
     struct sctstr sect;
-    s_char *what;
+    char *what;
     int amt;
-    s_char *p;
+    char *p;
     struct nstr_sect nstr;
-    s_char buf[1024];
+    char buf[1024];
 
-    if ((what = getstarg(player->argp[1],
-                        "Set What (iron, gold, oil, uranium, fertility)? ",
-                        buf)) == 0)
+    what = getstarg(player->argp[1],
+                   "Set what (iron, gold, oil, uranium, fertility)? ",
+                   buf);
+    if (!what)
        return RET_SYN;
     switch (what[0]) {
     case 'i':
        if (!snxtsct(&nstr, player->argp[2]))
            return RET_SYN;
        while (nxtsct(&nstr, &sect) > 0) {
-           if (!(p = getstarg(player->argp[3], "What value : ", buf)) ||
-               (*p == '\0'))
+           p = getstarg(player->argp[3], "What value : ", buf);
+           if (!p || !*p)
                return RET_SYN;
            amt = atoi(p);
            if (amt > 100)
@@ -81,7 +70,7 @@ setres(void)
            if (sect.sct_own != 0)
                resnoise(&sect, 1, "Iron ore content",
                         (int)sect.sct_min, amt);
-           sect.sct_min = (u_char)amt;
+           sect.sct_min = (unsigned char)amt;
            putsect(&sect);
        }
        break;
@@ -89,8 +78,8 @@ setres(void)
        if (!snxtsct(&nstr, player->argp[2]))
            return RET_SYN;
        while (nxtsct(&nstr, &sect) > 0) {
-           if (!(p = getstarg(player->argp[3], "What value : ", buf)) ||
-               (*p == '\0'))
+           p = getstarg(player->argp[3], "What value : ", buf);
+           if (!p || !*p)
                return RET_SYN;
            amt = atoi(p);
            if (amt > 100)
@@ -100,7 +89,7 @@ setres(void)
            if (sect.sct_own != 0)
                resnoise(&sect, 1, "Gold content",
                         (int)sect.sct_gmin, amt);
-           sect.sct_gmin = (u_char)amt;
+           sect.sct_gmin = (unsigned char)amt;
            putsect(&sect);
        }
        break;
@@ -108,8 +97,8 @@ setres(void)
        if (!snxtsct(&nstr, player->argp[2]))
            return RET_SYN;
        while (nxtsct(&nstr, &sect) > 0) {
-           if (!(p = getstarg(player->argp[3], "What value : ", buf)) ||
-               (*p == '\0'))
+           p = getstarg(player->argp[3], "What value : ", buf);
+           if (!p || !*p)
                return RET_SYN;
            amt = atoi(p);
            if (amt > 100)
@@ -118,7 +107,7 @@ setres(void)
                amt = 0;
            if (sect.sct_own != 0)
                resnoise(&sect, 1, "Oil content", (int)sect.sct_oil, amt);
-           sect.sct_oil = (u_char)amt;
+           sect.sct_oil = (unsigned char)amt;
            putsect(&sect);
        }
        break;
@@ -126,8 +115,8 @@ setres(void)
        if (!snxtsct(&nstr, player->argp[2]))
            return RET_SYN;
        while (nxtsct(&nstr, &sect) > 0) {
-           if (!(p = getstarg(player->argp[3], "What value : ", buf)) ||
-               (*p == '\0'))
+           p = getstarg(player->argp[3], "What value : ", buf);
+           if (!p || !*p)
                return RET_SYN;
            amt = atoi(p);
            if (amt > 100)
@@ -137,7 +126,7 @@ setres(void)
            if (sect.sct_own != 0)
                resnoise(&sect, 1, "Fertility content",
                         (int)sect.sct_fertil, amt);
-           sect.sct_fertil = (u_char)amt;
+           sect.sct_fertil = (unsigned char)amt;
            putsect(&sect);
        }
        break;
@@ -145,8 +134,8 @@ setres(void)
        if (!snxtsct(&nstr, player->argp[2]))
            return RET_SYN;
        while (nxtsct(&nstr, &sect) > 0) {
-           if (!(p = getstarg(player->argp[3], "What value : ", buf)) ||
-               (*p == '\0'))
+           p = getstarg(player->argp[3], "What value : ", buf);
+           if (!p || !*p)
                return RET_SYN;
            amt = atoi(p);
            if (amt > 100)
@@ -156,7 +145,7 @@ setres(void)
            if (sect.sct_own != 0)
                resnoise(&sect, 1, "Uranium content",
                         (int)sect.sct_uran, amt);
-           sect.sct_uran = (u_char)amt;
+           sect.sct_uran = (unsigned char)amt;
            putsect(&sect);
        }
        break;