Drop resnoise()'s second parameter

All callers pass the same argument.

diff --git a/include/prototypes.h b/include/prototypes.h
index 186e9cd50850596e04d69f4687f077ce29515cd6..7eb82df6156bd75b95c296c4671241bde42cb629 100644 (file)
--- a/include/prototypes.h
+++ b/include/prototypes.h
@@ -63,7 +63,7 @@ extern int nav_map(int, int, int);
 extern int do_unit_move(struct emp_qelem *, int *, double *, double *);
 extern int count_pop(int);
 extern int scuttle_tradeship(struct shpstr *, int);
-extern void resnoise(struct sctstr *, int, char *, int, int);
+extern void resnoise(struct sctstr *, char *, int, int);
 extern int line_of_sight(char **rad, int ax, int ay, int bx, int by);
 extern void plane_sona(struct emp_qelem *, int, int, struct shiplist **);
 extern char *prsub(struct shpstr *);

diff --git a/src/lib/commands/setres.c b/src/lib/commands/setres.c
index 3e3f6660a38c0df1ca18083a08310eefc4ec351d..3d411abff1d7adfe79944ce2f0565d3625c0c223 100644 (file)
--- a/src/lib/commands/setres.c
+++ b/src/lib/commands/setres.c
@@ -72,31 +72,27 @@ setres(void)
        switch (char0) {
        case 'i':
            if (sect.sct_own != 0)
-               resnoise(&sect, 1, "Iron ore content",
-                        (int)sect.sct_min, amt);
+               resnoise(&sect, "Iron ore content", sect.sct_min, amt);
            sect.sct_min = (unsigned char)amt;
            break;
        case 'g':
            if (sect.sct_own != 0)
-               resnoise(&sect, 1, "Gold content",
-                        (int)sect.sct_gmin, amt);
+               resnoise(&sect, "Gold content", sect.sct_gmin, amt);
            sect.sct_gmin = (unsigned char)amt;
            break;
        case 'o':
            if (sect.sct_own != 0)
-               resnoise(&sect, 1, "Oil content", (int)sect.sct_oil, amt);
+               resnoise(&sect, "Oil content", sect.sct_oil, amt);
            sect.sct_oil = (unsigned char)amt;
            break;
        case 'f':
            if (sect.sct_own != 0)
-               resnoise(&sect, 1, "Fertility content",
-                        (int)sect.sct_fertil, amt);
+               resnoise(&sect, "Fertility content", sect.sct_fertil, amt);
            sect.sct_fertil = (unsigned char)amt;
            break;
        case 'u':
            if (sect.sct_own != 0)
-               resnoise(&sect, 1, "Uranium content",
-                        (int)sect.sct_uran, amt);
+               resnoise(&sect, "Uranium content", sect.sct_uran, amt);
            sect.sct_uran = (unsigned char)amt;
            break;
        default:

diff --git a/src/lib/commands/setsect.c b/src/lib/commands/setsect.c
index 995fadc7df2000bc1ab1160617ed1aad9455333b..d9359d60b987c20ed4d5ccdafd740902dbced7c3 100644 (file)
--- a/src/lib/commands/setsect.c
+++ b/src/lib/commands/setsect.c
@@ -77,8 +77,7 @@ setsector(void)
            if (current > 100)
                current = 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;
            break;
        case 'g':
@@ -89,8 +88,7 @@ setsector(void)
            if (current > 100)
                current = 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;
            break;
        case 'o':
@@ -103,8 +101,7 @@ setsector(void)
                if (current > 100)
                    current = 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;
                break;
            case 'w':
@@ -159,7 +156,7 @@ setsector(void)
                if (current > MINES_MAX)
                    current = MINES_MAX;
                if (sect.sct_own != 0 && sect.sct_own == sect.sct_oldown)
-                   resnoise(&sect, 1, "Mines", sect.sct_mines, current);
+                   resnoise(&sect, "Mines", sect.sct_mines, current);
                sect.sct_mines = current;
                break;
            case 'o':
@@ -208,8 +205,7 @@ setsector(void)
            if (current > 100)
                current = 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;
            break;
        case 'u':
@@ -220,8 +216,7 @@ setsector(void)
            if (current > 100)
                current = 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;
            break;
        default:
@@ -249,21 +244,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));
 }