diff --git a/src/lib/commands/budg.c b/src/lib/commands/budg.c index 9cfeaa1a..2e10abd0 100644 --- a/src/lib/commands/budg.c +++ b/src/lib/commands/budg.c @@ -183,9 +183,9 @@ budg(void) expenses -= mil; } if (p_sect[SCT_CAPIT][0]) { - sprintf(in, "%s maintenance\t\t", dchr[SCT_CAPIT].d_name); - in[0] = toupper(in[0]); - pr(in); + pr("%c%s maintenance\t\t", + toupper(dchr[SCT_CAPIT].d_name[0]), + dchr[SCT_CAPIT].d_name + 1); n = p_sect[SCT_CAPIT][0]; sprintf(in, "%d %s", n, dchr[SCT_CAPIT].d_name); plurize(in, sizeof(in), n); diff --git a/src/lib/commands/look.c b/src/lib/commands/look.c index 9ffb4577..053b628f 100644 --- a/src/lib/commands/look.c +++ b/src/lib/commands/look.c @@ -89,7 +89,7 @@ look(void) pr("Your "); else 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, dchr[sect.sct_type].d_mnem, 0); pr(" %d%% efficient ", player->owner ? sect.sct_effic : @@ -223,7 +223,7 @@ llook(void) pr("Your "); else 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, dchr[sect.sct_type].d_mnem, 0); pr(" %d%% efficient ", player->owner ? sect.sct_effic : diff --git a/src/lib/subs/aircombat.c b/src/lib/subs/aircombat.c index 952c6ff3..e8468c92 100644 --- a/src/lib/subs/aircombat.c +++ b/src/lib/subs/aircombat.c @@ -160,9 +160,9 @@ ac_encounter(struct emp_qelem *bomb_list, struct emp_qelem *esc_list, if (sect.sct_own == plane_owner) PR(plane_owner, "Your "); else - PR(plane_owner, - "%s (#%d) ", cname(sect.sct_own), sect.sct_own); - PR(plane_owner, dchr[sect.sct_type].d_name); + PR(plane_owner, "%s (#%d) ", + cname(sect.sct_own), sect.sct_own); + PR(plane_owner, "%s", dchr[sect.sct_type].d_name); changed += map_set(plane_owner, sect.sct_x, sect.sct_y, dchr[sect.sct_type].d_mnem, 0); diff --git a/src/lib/subs/border.c b/src/lib/subs/border.c index a103a25b..7f069640 100644 --- a/src/lib/subs/border.c +++ b/src/lib/subs/border.c @@ -53,11 +53,11 @@ border(struct range *rp, s_char *prefstr, s_char *sep) /* * hundreds */ - pr(prefstr); + pr("%s", prefstr); for (x = rp->lx, n = 0; n < rp->width; n++, x++) { if (x >= WORLD_X / 2) x -= WORLD_X; - pr(sep); + pr("%s", sep); if (x < 0 && x > -100) { pr("-"); } else { @@ -71,11 +71,11 @@ border(struct range *rp, s_char *prefstr, s_char *sep) /* * tens */ - pr(prefstr); + pr("%s", prefstr); for (x = rp->lx, n = 0; n < rp->width; n++, x++) { if (x >= WORLD_X / 2) x -= WORLD_X; - pr(sep); + pr("%s", sep); if (x < 0 && x > -10) { pr("-"); } else { @@ -87,7 +87,7 @@ border(struct range *rp, s_char *prefstr, s_char *sep) /* * units... */ - pr(prefstr); + pr("%s", prefstr); for (x = rp->lx, n = 0; n < rp->width; n++, x++) { if (x >= WORLD_X / 2) x -= WORLD_X; diff --git a/src/lib/subs/pr.c b/src/lib/subs/pr.c index e156c667..15c58b85 100644 --- a/src/lib/subs/pr.c +++ b/src/lib/subs/pr.c @@ -427,12 +427,10 @@ prdate(void) void prxy(char *format, coord x, coord y, natid country) { - char buf[255]; struct natstr *np; np = getnatp(country); - sprintf(buf, format, xrel(np, x), yrel(np, y)); - pr(buf); + pr(format, xrel(np, x), yrel(np, y)); } /* diff --git a/src/lib/subs/show.c b/src/lib/subs/show.c index 5291a0b6..f7bd625b 100644 --- a/src/lib/subs/show.c +++ b/src/lib/subs/show.c @@ -204,7 +204,7 @@ show_nuke_capab(int tlev) if (NULL != (p = symbol_by_value(bit(i), nuke_chr_flags))) { if (j++ > 0) pr(" "); - pr(p); + pr("%s", p); } } pr("\n"); @@ -318,7 +318,7 @@ show_ship_capab(int tlev) if (NULL != (p = symbol_by_value(bit(j), ship_chr_flags))) { if (n++ > 0) pr(" "); - pr(p); + pr("%s", p); } } pr("\n"); @@ -369,7 +369,7 @@ show_plane_capab(int tlev) if (NULL != (p = symbol_by_value(bit(i), plane_chr_flags))) { if (n++ > 0) pr(" "); - pr(p); + pr("%s", p); } } pr("\n"); @@ -442,7 +442,7 @@ show_land_capab(int tlev) if (NULL != (p = symbol_by_value(bit(j), land_chr_flags))) { if (n++ > 0) pr(" "); - pr(p); + pr("%s", p); } } pr("\n");