]> git.pond.sub.org Git - empserver/blobdiff - src/lib/commands/setsect.c
Replace common pattern by new LIMIT_TO()
[empserver] / src / lib / commands / setsect.c
index 9c608e297849804ca3cc6f6c0932312801fe18a5..7163a7f9d15dbc738a02c41ff47d72193922f689 100644 (file)
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2013, 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/>.
  *
  *  ---
  *
  *  ---
  *
  *  setsect.c: Give resources to a country
- * 
+ *
  *  Known contributors to this file:
  *     David Muir Sharnoff
  *     Steve McClure, 1998
+ *     Markus Armbruster, 2004-2013
  */
 
 #include <config.h>
 
 #include "commands.h"
-#include "lost.h"
 #include "news.h"
 #include "optlist.h"
 
@@ -54,87 +53,51 @@ setsector(void)
     char buf[1024];
     char char0, char1;
 
-    if ((what = getstarg(player->argp[1],
-                        "Give What (iron, gold, oil, uranium, fertility, owner, eff., mob., work, avail., oldown, mines)? ",
-                        buf)) == 0)
+    what = getstarg(player->argp[1],
+                   "Give what (iron, gold, oil, uranium, fertility, owner, eff., mob., work, avail., oldown, mines)? ",
+                   buf);
+    if (!what)
        return RET_SYN;
     char0 = what[0];
     char1 = what[1];
 
-    switch (char0) {
-    case 'i':
-       if (!snxtsct(&nstr, player->argp[2]))
+    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);
+       amt = atoi(p);
+       if (!check_sect_ok(&sect))
+           return RET_FAIL;
+       switch (char0) {
+       case 'i':
            current = sect.sct_min;
            current += amt;
-           if (current < 0)
-               current = 0;
-           if (current > 100)
-               current = 100;
+           current = LIMIT_TO(current, 0, 100);
            if (sect.sct_own != 0)
-               resnoise(&sect, 1, "Iron ore content",
-                        (int)sect.sct_min, current);
+               resnoise(&sect, "Iron ore content", sect.sct_min, current);
            sect.sct_min = (unsigned char)current;
-           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);
+           break;
+       case 'g':
            current = sect.sct_gmin;
            current += amt;
-           if (current < 0)
-               current = 0;
-           if (current > 100)
-               current = 100;
+           current = LIMIT_TO(current, 0, 100);
            if (sect.sct_own != 0)
-               resnoise(&sect, 1, "Gold content",
-                        (int)sect.sct_gmin, current);
+               resnoise(&sect, "Gold content", sect.sct_gmin, current);
            sect.sct_gmin = (unsigned char)current;
-           putsect(&sect);
-       }
-       break;
-    case 'o':
-       switch (char1) {
-       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);
+           break;
+       case 'o':
+           switch (char1) {
+           case 'i':
                current = sect.sct_oil;
                current += amt;
-               if (current < 0)
-                   current = 0;
-               if (current > 100)
-                   current = 100;
+               current = LIMIT_TO(current, 0, 100);
                if (sect.sct_own != 0)
-                   resnoise(&sect, 1, "Oil content",
-                            (int)sect.sct_oil, current);
+                   resnoise(&sect, "Oil content", sect.sct_oil, current);
                sect.sct_oil = (unsigned char)current;
-               putsect(&sect);
-           }
-           break;
-       case 'w':
-           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);
+               break;
+           case 'w':
                if ((amt < 0) || (amt > MAXNOC - 1))
                    return RET_SYN;
                pr("Owner of %s changed from %s (#%d) to %s (#%d).\n",
@@ -150,17 +113,8 @@ setsector(void)
                       "Sector %s gained from deity intervention\n",
                       xyas(sect.sct_x, sect.sct_y, amt));
                sect.sct_own = (natid)amt;
-               putsect(&sect);
-           }
-           break;
-       case 'l':
-           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);
+               break;
+           case 'l':
                if ((amt < 0) || (amt > MAXNOC - 1))
                    return RET_SYN;
                pr("Old owner of %s changed from %s (#%d) to %s (#%d).\n",
@@ -168,166 +122,80 @@ setsector(void)
                   cname(sect.sct_oldown),
                   sect.sct_oldown, cname(amt), amt);
                sect.sct_oldown = (natid)amt;
-               putsect(&sect);
+               break;
+           default:
+               pr("huh?\n");
+               return RET_SYN;
            }
            break;
-       default:
-           pr("huh?\n");
-           return RET_SYN;
-       }
-       break;
-    case 'e':
-       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);
+       case 'e':
            current = sect.sct_effic;
            current += amt;
-           if (current < 0)
-               current = 0;
-           if (current > 100)
-               current = 100;
+           current = LIMIT_TO(current, 0, 100);
            pr("Efficiency in %s changed to %d.\n",
               xyas(sect.sct_x, sect.sct_y, player->cnum), current);
-           sect.sct_effic = (unsigned char)current;
-           putsect(&sect);
-       }
-       break;
-    case 'm':
-       switch (char1) {
-       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);
+           sect.sct_effic = current;
+           break;
+       case 'm':
+           switch (char1) {
+           case 'i':
                current = sect.sct_mines;
                current += amt;
-               if (current < 0)
-                   current = 0;
-               if (current > MINES_MAX)
-                   current = MINES_MAX;
-               if (sect.sct_own != 0)
-                   resnoise(&sect, 1, "Mines", sect.sct_mines, current);
+               current = LIMIT_TO(current, 0, MINES_MAX);
+               if (sect.sct_own != 0 && sect.sct_own == sect.sct_oldown)
+                   resnoise(&sect, "Mines", sect.sct_mines, current);
                sect.sct_mines = current;
-               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);
+               break;
+           case 'o':
                current = sect.sct_mobil;
                current += amt;
-               if (current < -127)
-                   current = -127;
-               if (current > 127)
-                   current = 127;
+               current = LIMIT_TO(current, -127, 127);
                pr("Mobility in %s changed to %d.\n",
                   xyas(sect.sct_x, sect.sct_y, player->cnum), current);
-               sect.sct_mobil = (short)current;
-               putsect(&sect);
+               sect.sct_mobil = current;
+               break;
+           default:
+               pr("huh?\n");
+               return RET_SYN;
            }
            break;
-       default:
-           pr("huh?\n");
-           return RET_SYN;
-       }
-       break;
-    case 'a':
-       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);
+       case 'a':
            current = sect.sct_avail;
            current += amt;
-           if (current < 0)
-               current = 0;
-           if (current > 9999)
-               current = 9999;
+           current = LIMIT_TO(current, 0, 9999);
            pr("Available in %s changed to %d.\n",
               xyas(sect.sct_x, sect.sct_y, player->cnum), current);
            sect.sct_avail = (short)current;
-           putsect(&sect);
-       }
-       break;
-    case 'w':
-       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);
+           break;
+       case 'w':
            current = sect.sct_work;
            current += amt;
-           if (current < 0)
-               current = 0;
-           if (current > 100)
-               current = 100;
+           current = LIMIT_TO(current, 0, 100);
            pr("Work in %s changed to %d.\n",
               xyas(sect.sct_x, sect.sct_y, player->cnum), current);
            sect.sct_work = (unsigned char)current;
-           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);
+           break;
+       case 'f':
            current = sect.sct_fertil;
            current += amt;
-           if (current < 0)
-               current = 0;
-           if (current > 100)
-               current = 100;
+           current = LIMIT_TO(current, 0, 100);
            if (sect.sct_own != 0)
-               resnoise(&sect, 1, "Fertility content",
-                        (int)sect.sct_fertil, current);
+               resnoise(&sect, "Fertility content", sect.sct_fertil, current);
            sect.sct_fertil = (unsigned char)current;
-           putsect(&sect);
-       }
-       break;
-    case 'u':
-       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);
+           break;
+       case 'u':
            current = sect.sct_uran;
            current += amt;
-           if (current < 0)
-               current = 0;
-           if (current > 100)
-               current = 100;
+           current = LIMIT_TO(current, 0, 100);
            if (sect.sct_own != 0)
-               resnoise(&sect, 1, "Uranium content",
-                        (int)sect.sct_uran, current);
+               resnoise(&sect, "Uranium content", sect.sct_uran, current);
            sect.sct_uran = (unsigned char)current;
-           putsect(&sect);
+           break;
+       default:
+           pr("huh?\n");
+           return RET_SYN;
        }
-       break;
-    default:
-       pr("huh?\n");
-       return RET_SYN;
+       putsect(&sect);
     }
     return RET_OK;
 }
@@ -348,21 +216,14 @@ resbenefit(natid who, int good)
 }
 
 void
-resnoise(struct sctstr *sptr, int public_amt, char *name, int old,
-        int new)
+resnoise(struct sctstr *sptr, char *name, int old, int new)
 {
-    char p[100];
-
     pr("%s of %s changed from %d to %d\n",
        name, xyas(sptr->sct_x, sptr->sct_y, player->cnum), old, new);
-    if (public_amt)
-       (void)sprintf(p, "changed from %d to %d", old, new);
-    else
-       (void)sprintf(p, "%s", old < new ? "increased" : "decreased");
     if (sptr->sct_own)
        wu(0, sptr->sct_own,
-          "%s in %s was %s by an act of %s\n",
+          "%s in %s was changed from %d to %d by an act of %s\n",
           name, xyas(sptr->sct_x, sptr->sct_y, sptr->sct_own),
-          p, cname(player->cnum));
+          old, new, cname(player->cnum));
     resbenefit(sptr->sct_own, (old < new));
 }