Drop prxy()'s parameter country

Argument is always player->cnum.  Hardly surprising, because that's
to whom it prints.

diff --git a/include/prototypes.h b/include/prototypes.h
index c5b5180bdca6754484b0ad7ee58ea5027706dec0..7ec32de195918d42bfc386909a224a5f62817246 100644 (file)
--- a/include/prototypes.h
+++ b/include/prototypes.h
@@ -571,7 +571,7 @@ extern void prprompt(int min, int btu);
 extern int prmptrd(char *prompt, char *str, int size);
 extern int uprmptrd(char *prompt, char *str, int size);
 extern void prdate(void);
-extern void prxy(char *format, coord x, coord y, natid country);
+extern void prxy(char *, coord, coord);
 extern void PR(int, char *, ...) ATTRIBUTE((format (printf, 2, 3)));
 extern void PRdate(natid cn);
 extern void pr_beep(void);

diff --git a/src/lib/commands/anti.c b/src/lib/commands/anti.c
index d17a7e79828c3ec28b3883883d4d8c3bce5b73d8..ed7925322444600033b1b86405e570fa744c6797 100644 (file)
--- a/src/lib/commands/anti.c
+++ b/src/lib/commands/anti.c
@@ -73,7 +73,7 @@ anti(void)
        avail_mil = sect.sct_mobil / 2;
        if (mil <= avail_mil)
            avail_mil = mil;
-       prxy("%4d,%-4d ", sect.sct_x, sect.sct_y, player->cnum);
+       prxy("%4d,%-4d ", sect.sct_x, sect.sct_y);
        if (avail_mil <= 0) {
            pr("No available mil or mob in sector.\n");
            continue;

diff --git a/src/lib/commands/carg.c b/src/lib/commands/carg.c
index 3263c6bcf267ed324ea3d6b609a2a45349043921..4c9ff605fc42f1d40820c1e6b84c2b11c3018427 100644 (file)
--- a/src/lib/commands/carg.c
+++ b/src/lib/commands/carg.c
@@ -57,7 +57,7 @@ carg(void)
            pr("shp#         x,y   flt eff  civ mil  uw  sh gun pet irn dst bar oil lcm hcm rad\n");
        pr("%4d ", ni.cur);
        pr("%-4.4s ", mchr[(int)ship.shp_type].m_name);
-       prxy("%4d,%-4d ", ship.shp_x, ship.shp_y, player->cnum);
+       prxy("%4d,%-4d ", ship.shp_x, ship.shp_y);
        pr("%1.1s", &ship.shp_fleet);
        pr("%4d%%", ship.shp_effic);
        pr("%4d", ship.shp_item[I_CIVIL]);
@@ -106,7 +106,7 @@ lcarg(void)
            pr("lnd# unit    x,y    a  eff  civ mil  uw  sh gun pet irn dst bar oil lcm hcm rad\n");
        pr("%4d ", ni.cur);
        pr("%-4.4s ", lchr[(int)land.lnd_type].l_name);
-       prxy("%4d,%-4d ", land.lnd_x, land.lnd_y, player->cnum);
+       prxy("%4d,%-4d ", land.lnd_x, land.lnd_y);
        pr("%1.1s ", &land.lnd_army);
        pr("%4d%%", land.lnd_effic);
        pr("%4d", land.lnd_item[I_CIVIL]);

diff --git a/src/lib/commands/cens.c b/src/lib/commands/cens.c
index df79e0f357f056d815a66d76accbb1775ff3dae5..de3ae2d8eb57899bb51871fae58dd432fe69b2be 100644 (file)
--- a/src/lib/commands/cens.c
+++ b/src/lib/commands/cens.c
@@ -64,7 +64,7 @@ cens(void)
            cens_hdr();
        if (player->god)
            pr("%3d ", sect.sct_own);
-       prxy("%4d,%-4d", nstr.x, nstr.y, player->cnum);
+       prxy("%4d,%-4d", nstr.x, nstr.y);
        pr(" %c", dchr[sect.sct_type].d_mnem);
        if (sect.sct_newtype != sect.sct_type)
            pr("%c", dchr[sect.sct_newtype].d_mnem);

diff --git a/src/lib/commands/comm.c b/src/lib/commands/comm.c
index ec972f1b32b755629f5019789800ae24643217b4..70664a5665bdbe6d62e125f125e0df3adb101686 100644 (file)
--- a/src/lib/commands/comm.c
+++ b/src/lib/commands/comm.c
@@ -67,7 +67,7 @@ comm(void)
        }
        if (player->god)
            pr("%3d", sect.sct_own);
-       prxy("%4d,%-4d", nstr.x, nstr.y, player->cnum);
+       prxy("%4d,%-4d", nstr.x, nstr.y);
        pr(" %c", dchr[sect.sct_type].d_mnem);
        pr(" %c", dirstr[sect.sct_del[I_SHELL] & 0x7]);
        pr("%c", dirstr[sect.sct_del[I_GUN] & 0x7]);

diff --git a/src/lib/commands/cuto.c b/src/lib/commands/cuto.c
index f71d3d481bf77f3bf86d8cb2f539811cf00e801e..80cda8178c58ac3ec2526b288f91d0551b63fac1 100644 (file)
--- a/src/lib/commands/cuto.c
+++ b/src/lib/commands/cuto.c
@@ -63,7 +63,7 @@ cuto(void)
        }
        if (player->god)
            pr("%3d", sect.sct_own);
-       prxy("%3d,%-3d", nstr.x, nstr.y, player->cnum);
+       prxy("%3d,%-3d", nstr.x, nstr.y);
        pr(" %c ", dchr[sect.sct_type].d_mnem);
        pr("%c", dirstr[sect.sct_del[I_CIVIL] & 0x7]);
        pr("%c", dirstr[sect.sct_del[I_MILIT] & 0x7]);

diff --git a/src/lib/commands/land.c b/src/lib/commands/land.c
index 0ed55f7184cd88086720cf407dae94030c5359f7..1b1ffd2a3e332352f40223f28da7ab725e86bcb0 100644 (file)
--- a/src/lib/commands/land.c
+++ b/src/lib/commands/land.c
@@ -65,7 +65,7 @@ land(void)
            pr("%3d ", land.lnd_own);
        pr("%4d ", ni.cur);
        pr("%-15.15s", lchr[(int)land.lnd_type].l_name);
-       prxy(" %4d,%-4d", land.lnd_x, land.lnd_y, player->cnum);
+       prxy(" %4d,%-4d", land.lnd_x, land.lnd_y);
        pr("%1.1s", &land.lnd_army);
        pr(" %c%3d%%", land.lnd_off ? '!' : ' ', land.lnd_effic);
        pr("%4d", land.lnd_item[I_MILIT]);

diff --git a/src/lib/commands/leve.c b/src/lib/commands/leve.c
index 3f0e2036ec1f519b2da2d0490784851356767f6f..3141d1b5d2ef3c71d6e0d4fe209b787e086eb2cf 100644 (file)
--- a/src/lib/commands/leve.c
+++ b/src/lib/commands/leve.c
@@ -58,9 +58,9 @@ leve(void)
        }
        if (player->god)
            pr("%2d ", sect.sct_own);
-       prxy("%3d,%-3d", nstr.x, nstr.y, player->cnum);
+       prxy("%3d,%-3d", nstr.x, nstr.y);
        pr(" %c ", dchr[sect.sct_type].d_mnem);
-       prxy("%3d,%-3d", sect.sct_dist_x, sect.sct_dist_y, player->cnum);
+       prxy("%3d,%-3d", sect.sct_dist_x, sect.sct_dist_y);
        pr(" %4d", sect.sct_dist[I_CIVIL]);
        pr("%4d", sect.sct_dist[I_MILIT]);
        pr("%4d", sect.sct_dist[I_UW]);

diff --git a/src/lib/commands/lost.c b/src/lib/commands/lost.c
index 662127d07fa58488515f89903cb0599c0f1fd62a..c1addbe34bdb97e00c84746ae18a3e9a1193a770 100644 (file)
--- a/src/lib/commands/lost.c
+++ b/src/lib/commands/lost.c
@@ -64,7 +64,7 @@ lost(void)
        if (player->god)
            pr("%d ", lost.lost_owner);
        pr("%d %d ", lost.lost_type, lost.lost_id);
-       prxy("%d %d ", lost.lost_x, lost.lost_y, player->cnum);
+       prxy("%d %d ", lost.lost_x, lost.lost_y);
        pr("%ld\n", (long)lost.lost_timestamp);
        nlost++;
     }

diff --git a/src/lib/commands/lstat.c b/src/lib/commands/lstat.c
index 153362a133c5e6aeec64a4249dd3627d3c3d4355..f43216e4b221d6ae832bf4be1368675f0410af5c 100644 (file)
--- a/src/lib/commands/lstat.c
+++ b/src/lib/commands/lstat.c
@@ -58,7 +58,7 @@ lsta(void)
            pr("lnd# %16.16s    x,y    eff tech att def vul  d  s  y  d  g  c  r  m  f\n", "unit-type");
        }
        pr("%4d %-16.16s ", land.lnd_uid, lcp->l_name);
-       prxy("%4d,%-4d", land.lnd_x, land.lnd_y, player->cnum);
+       prxy("%4d,%-4d", land.lnd_x, land.lnd_y);
        pr(" %3d%% %3d %1.1f %1.1f %3d ",
           land.lnd_effic, land.lnd_tech, lnd_att(&land), lnd_def(&land),
           lnd_vul(&land));

diff --git a/src/lib/commands/miss.c b/src/lib/commands/miss.c
index 7140ae2610ca35e9ed539ca478e245d1baa8941c..894ba30847eab42a2085871a035c99b2c4e0c254 100644 (file)
--- a/src/lib/commands/miss.c
+++ b/src/lib/commands/miss.c
@@ -312,7 +312,7 @@ show_mission(struct nstr_item *np)
            first = 0;
        }
        pr("%-25s", obj_nameof(gp));
-       prxy(" %3d,%-3d", gp->x, gp->y, player->cnum);
+       prxy(" %3d,%-3d", gp->x, gp->y);
        switch (gp->mission) {
        case MI_INTERDICT:
        case MI_SUPPORT:
@@ -321,7 +321,7 @@ show_mission(struct nstr_item *np)
        case MI_AIR_DEFENSE:
        case MI_DSUPPORT:
        case MI_OSUPPORT:
-           prxy(" %3d,%-3d", gp->opx, gp->opy, player->cnum);
+           prxy(" %3d,%-3d", gp->opx, gp->opy);
            pr("  %4d", gp->radius);
            break;
        default:

diff --git a/src/lib/commands/ndump.c b/src/lib/commands/ndump.c
index d228037ba2a29fffa01f584711632f17bc92813c..4e882e2595d8aeda9fd7f9ac4a6fe07084e3aee8 100644 (file)
--- a/src/lib/commands/ndump.c
+++ b/src/lib/commands/ndump.c
@@ -65,7 +65,7 @@ ndump(void)
        if (player->god)
            pr("%d ", nuk.nuk_own);
        pr("%d ", nuk.nuk_uid);
-       prxy("%d %d", nuk.nuk_x, nuk.nuk_y, player->cnum);
+       prxy("%d %d", nuk.nuk_x, nuk.nuk_y);
        pr(" %d", 1);
        pr(" %.5s", nchr[(int)nuk.nuk_type].n_name);
        pr("\n");

diff --git a/src/lib/commands/newe.c b/src/lib/commands/newe.c
index 53ceba7e747a051cc85091e403aecc938f636399..194ce6c781dfd65b296e3d8108619cb1d38640f3 100644 (file)
--- a/src/lib/commands/newe.c
+++ b/src/lib/commands/newe.c
@@ -130,7 +130,7 @@ newe(void)
            pr("EFFICIENCY SIMULATION\n");
            pr("   sect  des    projected eff\n");
        }
-       prxy("%4d,%-4d", nstr.x, nstr.y, player->cnum);
+       prxy("%4d,%-4d", nstr.x, nstr.y);
        pr(" %c", dchr[type].d_mnem);
        pr("    %3d%%\n", eff);
     }

diff --git a/src/lib/commands/nuke.c b/src/lib/commands/nuke.c
index 7e2462222fbd18a5afe9c02abcfd6929f69e0087..8b66e3cffde9e1ae901edfbcdb84418f103cbabc 100644 (file)
--- a/src/lib/commands/nuke.c
+++ b/src/lib/commands/nuke.c
@@ -62,7 +62,7 @@ nuke(void)
        if (player->god)
            pr("%-3d ", nuk.nuk_own);
        pr("%4d %-19.19s ", nstr.cur, nchr[(int)nuk.nuk_type].n_name);
-       prxy("%4d,%-4d", nuk.nuk_x, nuk.nuk_y, player->cnum);
+       prxy("%4d,%-4d", nuk.nuk_x, nuk.nuk_y);
        pr(" %1.1s %c%3d%% %4d",
           &nuk.nuk_stockpile, nuk.nuk_off ? '!' : ' ', nuk.nuk_effic,
           nuk.nuk_tech);

diff --git a/src/lib/commands/orde.c b/src/lib/commands/orde.c
index 17f3815ee654fbe6f3e8ae96b4475f59a655739f..9c2bf70e17df9e6a7dc652fd77a8b6fb8f747bd8 100644 (file)
--- a/src/lib/commands/orde.c
+++ b/src/lib/commands/orde.c
@@ -412,18 +412,16 @@ sorde(void)
            pr("%3d ", ship.shp_own);
        pr("%4d", nb.cur);
        pr(" %-16.16s", mchr[(int)ship.shp_type].m_name);
-       prxy(" %3d,%-3d", ship.shp_x, ship.shp_y, player->cnum);
+       prxy(" %3d,%-3d", ship.shp_x, ship.shp_y);
 
        if (ship.shp_autonav & AN_AUTONAV) {
            /* Destination 1 */
-           prxy(" %3d,%-3d",
-                ship.shp_destx[1], ship.shp_desty[1], player->cnum);
+           prxy(" %3d,%-3d", ship.shp_destx[1], ship.shp_desty[1]);
 
            /* Destination 2 */
            if ((ship.shp_destx[1] != ship.shp_destx[0])
                || (ship.shp_desty[1] != ship.shp_desty[0])) {
-               prxy(" %3d,%-3d",
-                    ship.shp_destx[0], ship.shp_desty[0], player->cnum);
+               prxy(" %3d,%-3d", ship.shp_destx[0], ship.shp_desty[0]);
            } else
                pr("        ");
 

diff --git a/src/lib/commands/payo.c b/src/lib/commands/payo.c
index d360b8363fbb99fb10ae98aaf75238aaaf9a5d4d..af500dc61f7f041dea3ee16a0624813056f879bb 100644 (file)
--- a/src/lib/commands/payo.c
+++ b/src/lib/commands/payo.c
@@ -76,12 +76,12 @@ payo(void)
        if (ship.shp_own != ship.shp_orig_own && !player->god) {
            /* Don't disclose construction site to pirates! */
            pr("    ?     ");
-           prxy("%4d,%-4d ", ship.shp_x, ship.shp_y, player->cnum);
+           prxy("%4d,%-4d ", ship.shp_x, ship.shp_y);
            pr("   ? $  ?\n");
            continue;
        }
-       prxy("%4d,%-4d ", ship.shp_orig_x, ship.shp_orig_y, player->cnum);
-       prxy("%4d,%-4d ", ship.shp_x, ship.shp_y, player->cnum);
+       prxy("%4d,%-4d ", ship.shp_orig_x, ship.shp_orig_y);
+       prxy("%4d,%-4d ", ship.shp_x, ship.shp_y);
 
        getsect(ship.shp_x, ship.shp_y, &sect);
 

diff --git a/src/lib/commands/peek.c b/src/lib/commands/peek.c
index cda73d5fb237e5142e13a0cef57360ffd1d0c81a..1d9a218345b7e5a77729d35b9623cfa073d299b1 100644 (file)
--- a/src/lib/commands/peek.c
+++ b/src/lib/commands/peek.c
@@ -56,7 +56,7 @@ peek(void)
            pr("own   sect        eff loyal cnum value  stage time mines\n");
        }
        pr("%3d ", sect.sct_own);
-       prxy("%4d,%-4d", nstr.x, nstr.y, player->cnum);
+       prxy("%4d,%-4d", nstr.x, nstr.y);
        pr(" %c  %3d%%   %3d  %3d  %3d    %3d   %3d  %3d",
           dchr[sect.sct_type].d_mnem, sect.sct_effic,
           sect.sct_loyal, sect.sct_che_target, sect.sct_che,

diff --git a/src/lib/commands/plan.c b/src/lib/commands/plan.c
index d031c682f1ec2c2dba820885930e9b1c4a5f8c68..7ce7d28fadde49c611719d916e9a872ebbc71f2e 100644 (file)
--- a/src/lib/commands/plan.c
+++ b/src/lib/commands/plan.c
@@ -64,7 +64,7 @@ plan(void)
        if (player->god)
            pr("%3d ", plane.pln_own);
        pr("%4d %-19.19s ", np.cur, plchr[(int)plane.pln_type].pl_name);
-       prxy("%4d,%-4d", plane.pln_x, plane.pln_y, player->cnum);
+       prxy("%4d,%-4d", plane.pln_x, plane.pln_y);
        pr(" %1.1s %c%3d%% %3d %3d %4d %3d  %3d",
           &plane.pln_wing, plane.pln_off ? '!' : ' ', plane.pln_effic,
           plane.pln_mobil, pln_def(&plane), plane.pln_tech,

diff --git a/src/lib/commands/prod.c b/src/lib/commands/prod.c
index efe470879b694c2d90079e1b9cbfdc216d772195..00292be6554e5fcb85a40cf713facea89b27fb76 100644 (file)
--- a/src/lib/commands/prod.c
+++ b/src/lib/commands/prod.c
@@ -327,7 +327,7 @@ prprod(coord x, coord y, int type, double p_e, double prodeff, int work,
        pr("   sect  des eff avail  make p.e. cost   use1 use2 use3  max1 max2 max3   max\n");
     }
 
-    prxy("%4d,%-4d", x, y, player->cnum);
+    prxy("%4d,%-4d", x, y);
     pr(" %c %3.0f%% %5d", dchr[type].d_mnem, p_e * 100.0, work);
     if (mnem == '.')
        pr(" %5.2f", make);

diff --git a/src/lib/commands/pstat.c b/src/lib/commands/pstat.c
index f49df9347c31559a180f04dec4168516b48562dd..148e75e36e5241270516bfb7f3ee0160b4a4663a 100644 (file)
--- a/src/lib/commands/pstat.c
+++ b/src/lib/commands/pstat.c
@@ -54,7 +54,7 @@ pstat(void)
        }
        pr("%4d %-22.22s ",
           plane.pln_uid, plchr[(int)plane.pln_type].pl_name);
-       prxy("%4d,%-4d", plane.pln_x, plane.pln_y, player->cnum);
+       prxy("%4d,%-4d", plane.pln_x, plane.pln_y);
        pr(" %3d%% %4d %3d %3d %3d %3d %4d %4d",
           plane.pln_effic,
           plane.pln_tech,

diff --git a/src/lib/commands/repo.c b/src/lib/commands/repo.c
index 7e9eee0e44bb6f9bf15a34ee97732196e94bed12..2d89836852e5a28109ae8595631bca6425dc2c27 100644 (file)
--- a/src/lib/commands/repo.c
+++ b/src/lib/commands/repo.c
@@ -93,7 +93,7 @@ repo_list(struct natstr *plnatp, struct natstr *natp)
        printdiff(plnatp, natp, NAT_HLEV);
     }
     if (player->god) {
-       prxy("  %4d,%-4d\n", natp->nat_xcap, natp->nat_ycap, player->cnum);
+       prxy("  %4d,%-4d\n", natp->nat_xcap, natp->nat_ycap);
     } else {
        if (!opt_HIDDEN && influx(natp))
            pr("In flux\n");

diff --git a/src/lib/commands/reso.c b/src/lib/commands/reso.c
index f74553fca6e1b217210a88bdde443fe55fe8930c..9ff33e4559160da4ce14eb5fb932a9e2f16e115f 100644 (file)
--- a/src/lib/commands/reso.c
+++ b/src/lib/commands/reso.c
@@ -56,7 +56,7 @@ reso(void)
            reso_hdr();
        if (player->god)
            pr("%3d ", sect.sct_own);
-       prxy("%4d,%-4d", nstr.x, nstr.y, player->cnum);
+       prxy("%4d,%-4d", nstr.x, nstr.y);
        pr(" %c", dchr[sect.sct_type].d_mnem);
        if (sect.sct_newtype != sect.sct_type)
            pr("%c", dchr[sect.sct_newtype].d_mnem);

diff --git a/src/lib/commands/retr.c b/src/lib/commands/retr.c
index a02d67da108c388733693209f1976834f2dc76fd..940288fdff11ab5e2f28e194661abb8e5947e102 100644 (file)
--- a/src/lib/commands/retr.c
+++ b/src/lib/commands/retr.c
@@ -164,7 +164,7 @@ retreat(int type)
            pr("%3d ", unit.gen.own);
        pr("%4d ", ni.cur);
        pr("%-16.16s ", name);
-       prxy("%4d,%-4d ", unit.gen.x, unit.gen.y, player->cnum);
+       prxy("%4d,%-4d ", unit.gen.x, unit.gen.y);
        pr("%1.1s", &unit.gen.group);
        pr(" %-11s", rpath);
        rflags = *rflagsp;

diff --git a/src/lib/commands/sail.c b/src/lib/commands/sail.c
index df2f7197a6efe76e34b10824dd48720f7aa5b88a..e9b8537ff5f6e533ccc7438a9513330c441125f1 100644 (file)
--- a/src/lib/commands/sail.c
+++ b/src/lib/commands/sail.c
@@ -57,7 +57,7 @@ show_sail(struct nstr_item *nstr)
            pr("%3d ", ship.shp_own);
        pr("%4d ", ship.shp_uid);
        pr("%-16.16s ", mchr[(int)ship.shp_type].m_name);
-       prxy("%4d,%-4d ", ship.shp_x, ship.shp_y, player->cnum);
+       prxy("%4d,%-4d ", ship.shp_x, ship.shp_y);
        pr("%3d  ", ship.shp_mobil);
        pr("   %3d     ", ship.shp_mobquota);
        pr("   %3d   ", ship.shp_follow);

diff --git a/src/lib/commands/shi.c b/src/lib/commands/shi.c
index 8aa5b385fed39ea060bb54961a6d1cf74132fe0e..1c564fc14ee9889e6e4c4aba90ae39ecb961313b 100644 (file)
--- a/src/lib/commands/shi.c
+++ b/src/lib/commands/shi.c
@@ -65,7 +65,7 @@ shi(void)
            pr("%3d ", ship.shp_own);
        pr("%4d ", ni.cur);
        pr("%-16.16s ", mchr[(int)ship.shp_type].m_name);
-       prxy("%4d,%-4d ", ship.shp_x, ship.shp_y, player->cnum);
+       prxy("%4d,%-4d ", ship.shp_x, ship.shp_y);
        pr("%1.1s", &ship.shp_fleet);
        pr(" %c%3d%%", ship.shp_off ? '!' : ' ', ship.shp_effic);
 

diff --git a/src/lib/commands/sinf.c b/src/lib/commands/sinf.c
index d93c77894e694f0869b8bbc9a1cdbaae5f796b34..4e7f3ece048c73760483f3ff7b466c4988b9111a 100644 (file)
--- a/src/lib/commands/sinf.c
+++ b/src/lib/commands/sinf.c
@@ -64,7 +64,7 @@ sinfra(void)
        }
        if (player->god)
            pr("%3d ", sect.sct_own);
-       prxy("%4d,%-4d", nstr.x, nstr.y, player->cnum);
+       prxy("%4d,%-4d", nstr.x, nstr.y);
        pr(" %c", dchr[sect.sct_type].d_mnem);
        if (sect.sct_newtype != sect.sct_type)
            pr("%c", dchr[sect.sct_newtype].d_mnem);

diff --git a/src/lib/commands/spy.c b/src/lib/commands/spy.c
index fe648cb72bf1f4108f224d3535f8739a443347e6..721de2ddd9c1d31b46a9353b09380f22a1df694e 100644 (file)
--- a/src/lib/commands/spy.c
+++ b/src/lib/commands/spy.c
@@ -182,7 +182,7 @@ spy(void)
 static void
 spy_report(struct sctstr *sp)
 {
-    prxy("%4d,%-4d", sp->sct_x, sp->sct_y, player->cnum);
+    prxy("%4d,%-4d", sp->sct_x, sp->sct_y);
     pr(" %c%c %3d %3d %3d %3d %3d %3d %4d %4d %4d %3d %4d %4d %4d\n",
        dchr[sp->sct_type].d_mnem,
        sp->sct_newtype == sp->sct_type ? ' ' : dchr[sp->sct_newtype].d_mnem,

diff --git a/src/lib/commands/sstat.c b/src/lib/commands/sstat.c
index 30270353b2bb44f676b9400f0803d01decfecf7a..44599812f6169e94bed18ecc3470da6a5af40f94 100644 (file)
--- a/src/lib/commands/sstat.c
+++ b/src/lib/commands/sstat.c
@@ -56,7 +56,7 @@ sstat(void)
               "ship-type");
        }
        pr("%4d %-22.22s ", ship.shp_uid, mchr[(int)ship.shp_type].m_name);
-       prxy("%4d,%-4d", ship.shp_x, ship.shp_y, player->cnum);
+       prxy("%4d,%-4d", ship.shp_x, ship.shp_y);
        pr(" %3d%% %4d %3d %3d %3d %3d %3d",
           ship.shp_effic,
           ship.shp_tech,

diff --git a/src/lib/commands/stop.c b/src/lib/commands/stop.c
index 7619716cdf3d5bf6d7a5a225513e0851e0deb20e..b1669c858a87985a0e8f9dda63bf98fcfdb65070 100644 (file)
--- a/src/lib/commands/stop.c
+++ b/src/lib/commands/stop.c
@@ -111,7 +111,7 @@ start_stop_sector(char *arg, int off)
            start_stop_hdr(off);
        if (player->god)
            pr("%3d ", sect.sct_own);
-       prxy("%4d,%-4d", nstr.x, nstr.y, player->cnum);
+       prxy("%4d,%-4d", nstr.x, nstr.y);
        pr(" %c", dchr[sect.sct_type].d_mnem);
        if (sect.sct_newtype != sect.sct_type)
            pr("%c", dchr[sect.sct_newtype].d_mnem);
@@ -171,7 +171,7 @@ start_stop_unit(int type, char *arg, int off)
        if (player->god)
            pr("%3d ", unit.gen.own);
        pr("%4d %-4.4s ", nstr.cur, empobj_chr_name(&unit.gen));
-       prxy("%4d,%-4d", unit.gen.x, unit.gen.y, player->cnum);
+       prxy("%4d,%-4d", unit.gen.x, unit.gen.y);
        pr("%4d%%", unit.gen.effic);
        proff(off);
        unit.gen.off = off;

diff --git a/src/lib/commands/stre.c b/src/lib/commands/stre.c
index a2b1c2b51cd92d32d4a3d265f6788e71d9cea6d6..6990a839942ad47a18c9ec8fa9662166a402ff32 100644 (file)
--- a/src/lib/commands/stre.c
+++ b/src/lib/commands/stre.c
@@ -65,7 +65,7 @@ stre(void)
            stre_hdr();
        if (player->god)
            pr("%3d ", sect.sct_own);
-       prxy("%4d,%-4d", nstr.x, nstr.y, player->cnum);
+       prxy("%4d,%-4d", nstr.x, nstr.y);
        pr(" %c", dchr[sect.sct_type].d_mnem);
        pr("%4d%%", sect.sct_effic);
        def->x = nstr.x;

diff --git a/src/lib/commands/strv.c b/src/lib/commands/strv.c
index c86bbed4e608fa546c5ddb5f458e74071b7cb09d..ba61cad635f8e291783fabe83ebea6fbbe06bd20 100644 (file)
--- a/src/lib/commands/strv.c
+++ b/src/lib/commands/strv.c
@@ -129,7 +129,7 @@ starv_sects(char *range)
            sect_hdr();
        if (player->god)
            pr("%3d ", sect.sct_own);
-       prxy("%4d,%-4d", nstr.x, nstr.y, player->cnum);
+       prxy("%4d,%-4d", nstr.x, nstr.y);
        pr(" %c", dchr[sect.sct_type].d_mnem);
        pr(" %c", sect.sct_own != sect.sct_oldown ? '*' : ' ');
        if (sect.sct_newtype != sect.sct_type)

diff --git a/src/lib/commands/swap.c b/src/lib/commands/swap.c
index 97eeca617efcd780bdaf4f4846a837860cff602e..6a23088d894e2e11e8be171f44c8a4ac6b6af37f 100644 (file)
--- a/src/lib/commands/swap.c
+++ b/src/lib/commands/swap.c
@@ -95,7 +95,7 @@ print_res(struct sctstr *sp)
 
     pr("%3d ", sp->sct_own);
 
-    prxy("%4d,%-4d", sp->sct_x, sp->sct_y, player->cnum);
+    prxy("%4d,%-4d", sp->sct_x, sp->sct_y);
     pr(" %c", dchr[sp->sct_type].d_mnem);
     if (sp->sct_newtype != sp->sct_type)
        pr("%c", dchr[sp->sct_newtype].d_mnem);

diff --git a/src/lib/subs/pr.c b/src/lib/subs/pr.c
index d87dabbe057a698f2a98be05b17ae52ca68cf036..5548c9d8bc5b28cfb7f1f53ea693b71131e98770 100644 (file)
--- a/src/lib/subs/pr.c
+++ b/src/lib/subs/pr.c
@@ -428,16 +428,16 @@ prdate(void)
 }
 
 /*
- * Print coordinates X, Y for COUNTRY.
+ * Print coordinates X, Y.
  * FORMAT must be a printf-style format string that converts exactly
  * two int values.
  */
 void
-prxy(char *format, coord x, coord y, natid country)
+prxy(char *format, coord x, coord y)
 {
     struct natstr *np;
 
-    np = getnatp(country);
+    np = getnatp(player->cnum);
     pr(format, xrel(np, x), yrel(np, y));
 }
 

diff --git a/src/lib/subs/satmap.c b/src/lib/subs/satmap.c
index a14810fcb8201b531841de1c39bdb808349329fe..c8ca907eae5fe8bf5ad9615f74dfa39de1e388fe 100644 (file)
--- a/src/lib/subs/satmap.c
+++ b/src/lib/subs/satmap.c
@@ -167,7 +167,7 @@ satmap(int x, int y, int eff, int range, int flags, int type)
                pr("%4d %4d %-16.16s %-25.25s ",
                   ship.shp_own, ship.shp_uid,
                   mchr[(int)ship.shp_type].m_name, ship.shp_name);
-               prxy("%4d,%-4d ", ship.shp_x, ship.shp_y, player->cnum);
+               prxy("%4d,%-4d ", ship.shp_x, ship.shp_y);
                pr("%3d%%\n", ship.shp_effic);
                ++count;
                if (opt_HIDDEN)
@@ -213,7 +213,7 @@ satmap(int x, int y, int eff, int range, int flags, int type)
                pr("%4d %4d %-16.16s ",
                   land.lnd_own, land.lnd_uid,
                   lchr[(int)land.lnd_type].l_name);
-               prxy("%4d,%-4d", land.lnd_x, land.lnd_y, player->cnum);
+               prxy("%4d,%-4d", land.lnd_x, land.lnd_y);
                pr("%3d%%\n", land.lnd_effic);
                ++count;
                if (opt_HIDDEN)
@@ -258,7 +258,7 @@ sathead(void)
 void
 satdisp_sect(struct sctstr *sp, int acc)
 {
-    prxy("%4d,%-4d   ", sp->sct_x, sp->sct_y, player->cnum);
+    prxy("%4d,%-4d   ", sp->sct_x, sp->sct_y);
     pr("%c  %3d  %3d %3d %3d %3d %4d %4d %4d %4d %4d %4d %5d\n",
        dchr[sp->sct_type].d_mnem,
        sp->sct_own, roundintby((int)sp->sct_effic, acc / 2),
@@ -298,7 +298,7 @@ satdisp_units(coord x, coord y)
        pr("\t%4d %4d %-16.16s %-25.25s ",
           ship.shp_own, ship.shp_uid,
           mchr[(int)ship.shp_type].m_name, ship.shp_name);
-       prxy("%4d,%-4d ", ship.shp_x, ship.shp_y, player->cnum);
+       prxy("%4d,%-4d ", ship.shp_x, ship.shp_y);
        pr("%3d%%\n", ship.shp_effic);
     }
 
@@ -325,7 +325,7 @@ satdisp_units(coord x, coord y)
 
        pr("\t%4d %4d %-16.16s ",
           land.lnd_own, land.lnd_uid, lchr[(int)land.lnd_type].l_name);
-       prxy("%4d,%-4d ", land.lnd_x, land.lnd_y, player->cnum);
+       prxy("%4d,%-4d ", land.lnd_x, land.lnd_y);
        pr("%3d%%\n", land.lnd_effic);
     }
 

diff --git a/src/lib/subs/unitsub.c b/src/lib/subs/unitsub.c
index 88058172c5da1cac5930cafe7dbd07fe984a6762..17750b533d0deafbfbd4ba64d88cf19b058577dc 100644 (file)
--- a/src/lib/subs/unitsub.c
+++ b/src/lib/subs/unitsub.c
@@ -75,7 +75,7 @@ unit_list(struct emp_qelem *unit_list)
            continue;
        pr("%4d ", unit->uid);
        pr("%-16.16s ", empobj_chr_name(unit));
-       prxy("%4d,%-4d ", unit->x, unit->y, player->cnum);
+       prxy("%4d,%-4d ", unit->x, unit->y);
        pr("%1.1s", &unit->group);
        pr("%4d%%", unit->effic);
        if (type == EF_LAND) {