Update copyright notice

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

diff --git a/src/lib/commands/setres.c b/src/lib/commands/setres.c
index 80b9bbbcb6dd526a11cc0e7b310bda3bd6a7d555..49c3cf93c58dbb3198f435f71eb084e14692505c 100644 (file)
--- a/src/lib/commands/setres.c
+++ b/src/lib/commands/setres.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2020, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -30,6 +30,7 @@
  *     David Muir Sharnoff
  *     Karl Hagen
  *     Steve McClure, 1998
+ *     Markus Armbruster, 2010-2013
  */
 
 #include <config.h>
@@ -44,7 +45,7 @@ setres(void)
 {
     struct sctstr sect;
     char *what;
-    int amt;
+    int ret;
     char *p;
     struct nstr_sect nstr;
     char buf[1024];
@@ -63,46 +64,30 @@ setres(void)
        p = getstarg(player->argp[3], "What value : ", buf);
        if (!p || !*p)
            return RET_SYN;
-       amt = atoi(p);
-       if (amt > 100)
-           amt = 100;
-       if (amt < 0)
-           amt = 0;
-       check_sect_ok(&sect);
+       if (!check_sect_ok(&sect))
+           return RET_FAIL;
        switch (char0) {
        case 'i':
-           if (sect.sct_own != 0)
-               resnoise(&sect, 1, "Iron ore content",
-                        (int)sect.sct_min, amt);
-           sect.sct_min = (unsigned char)amt;
+           ret = edit_sect(&sect, "i", p);
            break;
        case 'g':
-           if (sect.sct_own != 0)
-               resnoise(&sect, 1, "Gold content",
-                        (int)sect.sct_gmin, amt);
-           sect.sct_gmin = (unsigned char)amt;
+           ret = edit_sect(&sect, "g", p);
            break;
        case 'o':
-           if (sect.sct_own != 0)
-               resnoise(&sect, 1, "Oil content", (int)sect.sct_oil, amt);
-           sect.sct_oil = (unsigned char)amt;
+           ret = edit_sect(&sect, "c", p);
            break;
        case 'f':
-           if (sect.sct_own != 0)
-               resnoise(&sect, 1, "Fertility content",
-                        (int)sect.sct_fertil, amt);
-           sect.sct_fertil = (unsigned char)amt;
+           ret = edit_sect(&sect, "f", p);
            break;
        case 'u':
-           if (sect.sct_own != 0)
-               resnoise(&sect, 1, "Uranium content",
-                        (int)sect.sct_uran, amt);
-           sect.sct_uran = (unsigned char)amt;
+           ret = edit_sect(&sect, "u", p);
            break;
        default:
            pr("huh?\n");
-           return RET_SYN;
+           ret = RET_SYN;
        }
+       if (ret != RET_OK)
+           return ret;
        putsect(&sect);
     }
     return RET_OK;