Remove superfluous casts to natid

diff --git a/src/lib/commands/cede.c b/src/lib/commands/cede.c
index 8d5e1355bf9b42c497ccbe360e72dd6136848a08..82a3dc325d0925d6363873b09a194d79a944e1a3 100644 (file)
--- a/src/lib/commands/cede.c
+++ b/src/lib/commands/cede.c
@@ -164,7 +164,7 @@ cede_sect(struct nstr_sect *ns, natid to)
        putsect(&sect);
        pr("  %s %d%% ceded\n", xyas(sect.sct_x, sect.sct_y, player->cnum),
           (int)sect.sct_effic);
-       wu(0, (natid)to, "%s ceded to you by %s\n",
+       wu(0, to, "%s ceded to you by %s\n",
           xyas(sect.sct_x, sect.sct_y, to), cname(player->cnum));
     }
     pr("%d sector%s\n", nsect, splur(nsect));

diff --git a/src/lib/player/login.c b/src/lib/player/login.c
index 7f66a23a0883e5d8d15caf420be4d954c7edc9dd..c08eaf6f7f956b84a848e6f3a348aa941da6c697 100644 (file)
--- a/src/lib/player/login.c
+++ b/src/lib/player/login.c
@@ -342,7 +342,7 @@ play_cmd(void)
     }
     if (!may_play())
        return RET_FAIL;
-    other = getplayer((natid)player->cnum);
+    other = getplayer(player->cnum);
     if (other) {
        natp = getnatp(player->cnum);
        if (natp->nat_stat != STAT_VIS) {

diff --git a/src/lib/update/nat.c b/src/lib/update/nat.c
index 6e8985443eea70df5c85bc6eaa37d6ee3aea4901..bb45748c31b07b85ba423b1031473a6511bc6903 100644 (file)
--- a/src/lib/update/nat.c
+++ b/src/lib/update/nat.c
@@ -152,7 +152,7 @@ prod_nat(int etu)
        hap = levels[n][NAT_HLEV] * hap_edu * hap_cons /
            ((float)pop * etu);
        edu = levels[n][NAT_ELEV] * edu_cons / ((float)pop * etu);
-       wu((natid)0, n, "%3.0f happiness, %3.0f education produced\n",
+       wu(0, n, "%3.0f happiness, %3.0f education produced\n",
           levels[n][NAT_HLEV], levels[n][NAT_ELEV]);
        hap = limit_level(hap, NAT_HLEV, 1);
        edu = limit_level(edu, NAT_ELEV, 1);
@@ -174,8 +174,7 @@ prod_nat(int etu)
            limit_level(levels[n][NAT_TLEV] / 1, NAT_TLEV, 0) * 1;
        levels[n][NAT_RLEV] =
            limit_level(levels[n][NAT_RLEV] / 1, NAT_RLEV, 0) * 1;
-       wu((natid)0, n,
-          "total pop was %ld, yielding %4.2f hap, %4.2f edu\n",
+       wu(0, n, "total pop was %ld, yielding %4.2f hap, %4.2f edu\n",
           pop - 1, hap, edu);
     }
     if (ally_factor > 0.0)
@@ -190,15 +189,12 @@ prod_nat(int etu)
        tlev = levels[n][NAT_TLEV];
        rlev = levels[n][NAT_RLEV];
        if (tech[n] != 0.0 || res[n] != 0.0) {
-           wu((natid)0, n,
-              "%5.4f technology (%5.4f + %5.4f), ",
+           wu(0, n, "%5.4f technology (%5.4f + %5.4f), ",
               tlev + tech[n], tlev, tech[n]);
-           wu((natid)0, n,
-              "%5.4f research (%5.4f + %5.4f) produced\n",
+           wu(0, n, "%5.4f research (%5.4f + %5.4f) produced\n",
               rlev + res[n], rlev, res[n]);
        } else
-           wu((natid)0, n,
-              "%5.4f tech, %5.4f research produced\n", tlev, rlev);
+           wu(0, n, "%5.4f tech, %5.4f research produced\n", tlev, rlev);
        rlev += res[n];
        tlev += tech[n];
        if (rlev != 0.0)
@@ -207,10 +203,10 @@ prod_nat(int etu)
            np->nat_level[NAT_TLEV] += tlev;
        if ((sea_money[n] != 0) || (air_money[n] != 0) ||
            (lnd_money[n] != 0))
-           wu((natid)0, n,
+           wu(0, n,
               "Army delta $%ld, Navy delta $%ld, Air force delta $%ld\n",
               lnd_money[n], sea_money[n], air_money[n]);
-       wu((natid)0, n, "money delta was $%ld for this update\n",
+       wu(0, n, "money delta was $%ld for this update\n",
           np->nat_money - money[n]);
        if (opt_LOSE_CONTACT) {
            for (cn = 1; cn < MAXNOC; cn++) {

diff --git a/src/lib/update/produce.c b/src/lib/update/produce.c
index 57241f8b2d475fb33485a88beedddcf752ce012e..0feebf5bbe4881ea46bbc4911294c35c5a13183b 100644 (file)
--- a/src/lib/update/produce.c
+++ b/src/lib/update/produce.c
@@ -114,7 +114,7 @@ produce(struct natstr *np, struct sctstr *sp, short *vec, int work,
        actual = ldround(output, 1);
        if (!player->simulation) {
            levels[sp->sct_own][product->p_level] += output;
-           wu((natid)0, sp->sct_own, "%s (%.2f) produced in %s\n",
+           wu(0, sp->sct_own, "%s (%.2f) produced in %s\n",
               product->p_name, output, ownxy(sp));
        }
     } else {