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

(show_nuke_capab, show_ship_capab, show_plane_capab, show_land_capab)

Browse source 
(prxy, border, ac_encounter, look, budg): Fix misuse of pr() and PR():
passed formatted string instead of format string and arguments.
Correctness depends on argument values and tables not containing '%',
which is correct, but fragile.
This commit is contained in:
Markus Armbruster 2006-03-26 13:41:46 +00:00
parent 65168f0d93
commit b0a5d11a3f
6 changed files with 18 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -183,9 +183,9 @@ budg(void)
expenses -= mil; expenses -= mil;
} }
if (p_sect[SCT_CAPIT][0]) { if (p_sect[SCT_CAPIT][0]) {
sprintf(in, "%s maintenance\t\t", dchr[SCT_CAPIT].d_name); pr("%c%s maintenance\t\t",
in[0] = toupper(in[0]); toupper(dchr[SCT_CAPIT].d_name[0]),
pr(in); dchr[SCT_CAPIT].d_name + 1);
n = p_sect[SCT_CAPIT][0]; n = p_sect[SCT_CAPIT][0];
sprintf(in, "%d %s", n, dchr[SCT_CAPIT].d_name); sprintf(in, "%d %s", n, dchr[SCT_CAPIT].d_name);
plurize(in, sizeof(in), n); plurize(in, sizeof(in), n);

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

@ -89,7 +89,7 @@ look(void)
pr("Your "); pr("Your ");
else else
pr("%s (#%d) ", cname(sect.sct_own), sect.sct_own); pr("%s (#%d) ", cname(sect.sct_own), sect.sct_own);
pr(dchr[sect.sct_type].d_name); pr("%s", dchr[sect.sct_type].d_name);
changed += map_set(player->cnum, x, y, changed += map_set(player->cnum, x, y,
dchr[sect.sct_type].d_mnem, 0); dchr[sect.sct_type].d_mnem, 0);
pr(" %d%% efficient ", player->owner ? sect.sct_effic : pr(" %d%% efficient ", player->owner ? sect.sct_effic :
@ -223,7 +223,7 @@ llook(void)
pr("Your "); pr("Your ");
else else
pr("%s (#%d) ", cname(sect.sct_own), sect.sct_own); pr("%s (#%d) ", cname(sect.sct_own), sect.sct_own);
pr(dchr[sect.sct_type].d_name); pr("%s", dchr[sect.sct_type].d_name);
changed += map_set(player->cnum, x, y, changed += map_set(player->cnum, x, y,
dchr[sect.sct_type].d_mnem, 0); dchr[sect.sct_type].d_mnem, 0);
pr(" %d%% efficient ", player->owner ? sect.sct_effic : pr(" %d%% efficient ", player->owner ? sect.sct_effic :

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

@ -160,9 +160,9 @@ ac_encounter(struct emp_qelem *bomb_list, struct emp_qelem *esc_list,
if (sect.sct_own == plane_owner) if (sect.sct_own == plane_owner)
PR(plane_owner, "Your "); PR(plane_owner, "Your ");
else else
PR(plane_owner, PR(plane_owner, "%s (#%d) ",
"%s (#%d) ", cname(sect.sct_own), sect.sct_own); cname(sect.sct_own), sect.sct_own);
PR(plane_owner, dchr[sect.sct_type].d_name); PR(plane_owner, "%s", dchr[sect.sct_type].d_name);
changed += map_set(plane_owner, changed += map_set(plane_owner,
sect.sct_x, sect.sct_y, sect.sct_x, sect.sct_y,
dchr[sect.sct_type].d_mnem, 0); dchr[sect.sct_type].d_mnem, 0);

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

@ -53,11 +53,11 @@ border(struct range *rp, s_char *prefstr, s_char *sep)
/* /*
* hundreds * hundreds
*/ */
pr(prefstr); pr("%s", prefstr);
for (x = rp->lx, n = 0; n < rp->width; n++, x++) { for (x = rp->lx, n = 0; n < rp->width; n++, x++) {
if (x >= WORLD_X / 2) if (x >= WORLD_X / 2)
x -= WORLD_X; x -= WORLD_X;
pr(sep); pr("%s", sep);
if (x < 0 && x > -100) { if (x < 0 && x > -100) {
pr("-"); pr("-");
} else { } else {
@ -71,11 +71,11 @@ border(struct range *rp, s_char *prefstr, s_char *sep)
/* /*
* tens * tens
*/ */
pr(prefstr); pr("%s", prefstr);
for (x = rp->lx, n = 0; n < rp->width; n++, x++) { for (x = rp->lx, n = 0; n < rp->width; n++, x++) {
if (x >= WORLD_X / 2) if (x >= WORLD_X / 2)
x -= WORLD_X; x -= WORLD_X;
pr(sep); pr("%s", sep);
if (x < 0 && x > -10) { if (x < 0 && x > -10) {
pr("-"); pr("-");
} else { } else {
@ -87,7 +87,7 @@ border(struct range *rp, s_char *prefstr, s_char *sep)
/* /*
* units... * units...
*/ */
pr(prefstr); pr("%s", prefstr);
for (x = rp->lx, n = 0; n < rp->width; n++, x++) { for (x = rp->lx, n = 0; n < rp->width; n++, x++) {
if (x >= WORLD_X / 2) if (x >= WORLD_X / 2)
x -= WORLD_X; x -= WORLD_X;

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

@ -427,12 +427,10 @@ prdate(void)
void void
prxy(char *format, coord x, coord y, natid country) prxy(char *format, coord x, coord y, natid country)
{ {
char buf[255];
struct natstr *np; struct natstr *np;
np = getnatp(country); np = getnatp(country);
sprintf(buf, format, xrel(np, x), yrel(np, y)); pr(format, xrel(np, x), yrel(np, y));
pr(buf);
} }
/* /*

8
src/lib/subs/show.c
View file

@ -204,7 +204,7 @@ show_nuke_capab(int tlev)
if (NULL != (p = symbol_by_value(bit(i), nuke_chr_flags))) { if (NULL != (p = symbol_by_value(bit(i), nuke_chr_flags))) {
if (j++ > 0) if (j++ > 0)
pr(" "); pr(" ");
pr(p); pr("%s", p);
} }
} }
pr("\n"); pr("\n");
@ -318,7 +318,7 @@ show_ship_capab(int tlev)
if (NULL != (p = symbol_by_value(bit(j), ship_chr_flags))) { if (NULL != (p = symbol_by_value(bit(j), ship_chr_flags))) {
if (n++ > 0) if (n++ > 0)
pr(" "); pr(" ");
pr(p); pr("%s", p);
} }
} }
pr("\n"); pr("\n");
@ -369,7 +369,7 @@ show_plane_capab(int tlev)
if (NULL != (p = symbol_by_value(bit(i), plane_chr_flags))) { if (NULL != (p = symbol_by_value(bit(i), plane_chr_flags))) {
if (n++ > 0) if (n++ > 0)
pr(" "); pr(" ");
pr(p); pr("%s", p);
} }
} }
pr("\n"); pr("\n");
@ -442,7 +442,7 @@ show_land_capab(int tlev)
if (NULL != (p = symbol_by_value(bit(j), land_chr_flags))) { if (NULL != (p = symbol_by_value(bit(j), land_chr_flags))) {
if (n++ > 0) if (n++ > 0)
pr(" "); pr(" ");
pr(p); pr("%s", p);
} }
} }
pr("\n"); pr("\n");