diff --git a/include/prototypes.h b/include/prototypes.h index c5b5180b..7ec32de1 100644 --- 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 d17a7e79..ed792532 100644 --- 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 3263c6bc..4c9ff605 100644 --- 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 df79e0f3..de3ae2d8 100644 --- 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 ec972f1b..70664a56 100644 --- 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 f71d3d48..80cda817 100644 --- 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 0ed55f71..1b1ffd2a 100644 --- 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 3f0e2036..3141d1b5 100644 --- 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 662127d0..c1addbe3 100644 --- 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 153362a1..f43216e4 100644 --- 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 7140ae26..894ba308 100644 --- 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 d228037b..4e882e25 100644 --- 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 53ceba7e..194ce6c7 100644 --- 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 7e246222..8b66e3cf 100644 --- 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 17f3815e..9c2bf70e 100644 --- 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 d360b836..af500dc6 100644 --- 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, §); diff --git a/src/lib/commands/peek.c b/src/lib/commands/peek.c index cda73d5f..1d9a2183 100644 --- 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 d031c682..7ce7d28f 100644 --- 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 efe47087..00292be6 100644 --- 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 f49df934..148e75e3 100644 --- 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 7e9eee0e..2d898368 100644 --- 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 f74553fc..9ff33e45 100644 --- 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 a02d67da..940288fd 100644 --- 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 df2f7197..e9b8537f 100644 --- 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 8aa5b385..1c564fc1 100644 --- 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 d93c7789..4e7f3ece 100644 --- 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 fe648cb7..721de2dd 100644 --- 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 30270353..44599812 100644 --- 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 7619716c..b1669c85 100644 --- 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 a2b1c2b5..6990a839 100644 --- 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 c86bbed4..ba61cad6 100644 --- 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 97eeca61..6a23088d 100644 --- 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 d87dabbe..5548c9d8 100644 --- 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 a14810fc..c8ca907e 100644 --- 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 88058172..17750b53 100644 --- 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) {