Update copyright notice

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

diff --git a/src/lib/commands/setres.c b/src/lib/commands/setres.c
index 7a5f6e1cc6858caf5d259abf94caffce79ba957a..49c3cf93c58dbb3198f435f71eb084e14692505c 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-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2020, 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,24 +25,16 @@
  *  ---
  *
  *  setres.c: Set resources of a sector
- * 
+ *
  *  Known contributors to this file:
  *     David Muir Sharnoff
  *     Karl Hagen
  *     Steve McClure, 1998
+ *     Markus Armbruster, 2010-2013
  */
 
 #include <config.h>
 
-#include <stdio.h>
-#include <ctype.h>
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
-#include "nat.h"
-#include "nsc.h"
-#include "file.h"
 #include "commands.h"
 
 /*
@@ -53,114 +44,51 @@ int
 setres(void)
 {
     struct sctstr sect;
-    s_char *what;
-    int amt;
-    s_char *p;
+    char *what;
+    int ret;
+    char *p;
     struct nstr_sect nstr;
-    s_char buf[1024];
+    char buf[1024];
+    char char0;
 
-    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'))
-               return RET_SYN;
-           amt = atoi(p);
-           if (amt > 100)
-               amt = 100;
-           if (amt < 0)
-               amt = 0;
-           if (sect.sct_own != 0)
-               resnoise(&sect, 1, "Iron ore content",
-                        (int)sect.sct_min, amt);
-           sect.sct_min = (u_char)amt;
-           putsect(&sect);
-       }
-       break;
-    case 'g':
-       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'))
-               return RET_SYN;
-           amt = atoi(p);
-           if (amt > 100)
-               amt = 100;
-           if (amt < 0)
-               amt = 0;
-           if (sect.sct_own != 0)
-               resnoise(&sect, 1, "Gold content",
-                        (int)sect.sct_gmin, amt);
-           sect.sct_gmin = (u_char)amt;
-           putsect(&sect);
-       }
-       break;
-    case 'o':
-       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'))
-               return RET_SYN;
-           amt = atoi(p);
-           if (amt > 100)
-               amt = 100;
-           if (amt < 0)
-               amt = 0;
-           if (sect.sct_own != 0)
-               resnoise(&sect, 1, "Oil content", (int)sect.sct_oil, amt);
-           sect.sct_oil = (u_char)amt;
-           putsect(&sect);
-       }
-       break;
-    case 'f':
-       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'))
-               return RET_SYN;
-           amt = atoi(p);
-           if (amt > 100)
-               amt = 100;
-           if (amt < 0)
-               amt = 0;
-           if (sect.sct_own != 0)
-               resnoise(&sect, 1, "Fertility content",
-                        (int)sect.sct_fertil, amt);
-           sect.sct_fertil = (u_char)amt;
-           putsect(&sect);
-       }
-       break;
-    case 'u':
-       if (!snxtsct(&nstr, player->argp[2]))
+    char0 = what[0];
+
+    if (!snxtsct(&nstr, player->argp[2]))
+       return RET_SYN;
+    while (nxtsct(&nstr, &sect) > 0) {
+       p = getstarg(player->argp[3], "What value : ", buf);
+       if (!p || !*p)
            return RET_SYN;
-       while (nxtsct(&nstr, &sect) > 0) {
-           if (!(p = getstarg(player->argp[3], "What value : ", buf)) ||
-               (*p == '\0'))
-               return RET_SYN;
-           amt = atoi(p);
-           if (amt > 100)
-               amt = 100;
-           if (amt < 0)
-               amt = 0;
-           if (sect.sct_own != 0)
-               resnoise(&sect, 1, "Uranium content",
-                        (int)sect.sct_uran, amt);
-           sect.sct_uran = (u_char)amt;
-           putsect(&sect);
+       if (!check_sect_ok(&sect))
+           return RET_FAIL;
+       switch (char0) {
+       case 'i':
+           ret = edit_sect(&sect, "i", p);
+           break;
+       case 'g':
+           ret = edit_sect(&sect, "g", p);
+           break;
+       case 'o':
+           ret = edit_sect(&sect, "c", p);
+           break;
+       case 'f':
+           ret = edit_sect(&sect, "f", p);
+           break;
+       case 'u':
+           ret = edit_sect(&sect, "u", p);
+           break;
+       default:
+           pr("huh?\n");
+           ret = RET_SYN;
        }
-       break;
-    default:
-       pr("huh?\n");
-       return RET_SYN;
+       if (ret != RET_OK)
+           return ret;
+       putsect(&sect);
     }
     return RET_OK;
 }