empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Drop prxy()'s parameter country

Browse source 
Argument is always player->cnum.  Hardly surprising, because that's
to whom it prints.
This commit is contained in:
Markus Armbruster 2010-05-24 09:05:51 +02:00
parent 5f3fa793b7
commit 5920515cd7
35 changed files with 49 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/prototypes.h
View file

@ -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);

2
src/lib/commands/anti.c
View file

@ -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;

4
src/lib/commands/carg.c
View file

@ -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]);

2
src/lib/commands/cens.c
View file

@ -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);

2
src/lib/commands/comm.c
View file

@ -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]);

2
src/lib/commands/cuto.c
View file

@ -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]);

2
src/lib/commands/land.c
View file

@ -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]);

4
src/lib/commands/leve.c
View file

@ -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]);

2
src/lib/commands/lost.c
View file

@ -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++;
}

2
src/lib/commands/lstat.c
View file

@ -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));

4
src/lib/commands/miss.c
View file

@ -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:

2
src/lib/commands/ndump.c
View file

@ -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");

2
src/lib/commands/newe.c
View file

@ -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);
}

2
src/lib/commands/nuke.c
View file

@ -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);

8
src/lib/commands/orde.c
View file

@ -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(" ");

6
src/lib/commands/payo.c
View file

@ -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);

2
src/lib/commands/peek.c
View file

@ -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,

2
src/lib/commands/plan.c
View file

@ -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,

2
src/lib/commands/prod.c
View file

@ -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);

2
src/lib/commands/pstat.c
View file

@ -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,

2
src/lib/commands/repo.c
View file

@ -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");

2
src/lib/commands/reso.c
View file

@ -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);

2
src/lib/commands/retr.c
View file

@ -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;

2
src/lib/commands/sail.c
View file

@ -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);

2
src/lib/commands/shi.c
View file

@ -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);

2
src/lib/commands/sinf.c
View file

@ -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);

2
src/lib/commands/spy.c
View file

@ -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,

2
src/lib/commands/sstat.c
View file

@ -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,

4
src/lib/commands/stop.c
View file

@ -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;

2
src/lib/commands/stre.c
View file

@ -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;

2
src/lib/commands/strv.c
View file

@ -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)

2
src/lib/commands/swap.c
View file

@ -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);

6
src/lib/subs/pr.c
View file

@ -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));
}

10
src/lib/subs/satmap.c
View file

@ -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);
}

2
src/lib/subs/unitsub.c
View file

@ -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) {