anything any;
char buf[BUFSZ], buf2[BUFSZ];
static char fmtstr[] = "%-15s: %-12s";
+ char deity_fmtstr[] = "%-17s%s";
any.a_void = 0;
buf[0] = buf2[0] = '\0';
/* Deity list */
add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE, "", FALSE);
add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_BOLD, "Deities", FALSE);
- Sprintf(buf2, "%-17s%s", align_gname(A_CHAOTIC),
+ Sprintf(buf2, deity_fmtstr, align_gname(A_CHAOTIC),
(u.ualignbase[A_ORIGINAL] == u.ualign.type
&& u.ualign.type == A_CHAOTIC) ? " (s,c)" :
(u.ualignbase[A_ORIGINAL] == A_CHAOTIC) ? " (s)" :
Sprintf(buf, fmtstr, "chaotic deity", buf2);
add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE, buf, FALSE);
- Sprintf(buf2, "%-17s%s", align_gname(A_NEUTRAL),
+ Sprintf(buf2, deity_fmtstr, align_gname(A_NEUTRAL),
(u.ualignbase[A_ORIGINAL] == u.ualign.type
&& u.ualign.type == A_NEUTRAL) ? " (s,c)" :
(u.ualignbase[A_ORIGINAL] == A_NEUTRAL) ? " (s)" :
Sprintf(buf, fmtstr, "neutral deity", buf2);
add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE, buf, FALSE);
- Sprintf(buf2, "%-17s%s", align_gname(A_LAWFUL),
+ Sprintf(buf2, deity_fmtstr, align_gname(A_LAWFUL),
(u.ualignbase[A_ORIGINAL] == u.ualign.type && u.ualign.type == A_LAWFUL) ? " (s,c)" :
(u.ualignbase[A_ORIGINAL] == A_LAWFUL) ? " (s)" :
(u.ualign.type == A_LAWFUL) ? " (c)" : "");
#endif
static char fmtstr_doset_add_menu[] = "%s%-15s [%s] ";
-static char fmtstr_doset_add_menu_tab[] = "%s\t%s\t[%s] ";
+static char fmtstr_doset_add_menu_tab[] = "%s\t[%s]";
STATIC_OVL void
doset_add_menu(win, option, indexoffset)
}
}
/* " " replaces "a - " -- assumes menus follow that style */
- Sprintf(buf, iflags.menu_tab_sep ? fmtstr_doset_add_menu_tab : fmtstr_doset_add_menu,
- any.a_int ? "" : iflags.menu_tab_sep ? "" : " ", option, value);
+ if (!iflags.menu_tab_sep)
+ Sprintf(buf, fmtstr_doset_add_menu, any.a_int ? "" : " ", option, value);
+ else
+ Sprintf(buf, fmtstr_doset_add_menu_tab, option, value);
add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE, buf, MENU_UNSELECTED);
}
pass == 0 ? " " : "",
boolopt[i].name, *bool_p ? "true" : "false");
else
- Sprintf(buf, "%s\t%s\t[%s]",
- pass == 0 ? " " : "",
+ Sprintf(buf, "%s\t[%s]",
boolopt[i].name, *bool_p ? "true" : "false");
add_menu(tmpwin, NO_GLYPH, &any, 0, 0,
ATR_NONE, buf, MENU_UNSELECTED);
-/* SCCS Id: @(#)spell.c 3.4 2002/01/19 */
+/* SCCS Id: @(#)spell.c 3.4 2002/02/12 */
/* Copyright (c) M. Stephenson 1988 */
/* NetHack may be freely redistributed. See license for details. */
* To do it right would require that we implement columns
* in the window-ports (say via a tab character).
*/
- Sprintf(buf, "%-20s Level %-12s Fail", " Name", "Category");
+ if (!iflags.menu_tab_sep)
+ Sprintf(buf, "%-20s Level %-12s Fail", " Name", "Category");
+ else
+ Sprintf(buf, "%-20s\tLevel\tCategory\tFail", "Name");
add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE, buf, MENU_UNSELECTED);
for (i = 0; i < MAXSPELL && spellid(i) != NO_SPELL; i++) {
- Sprintf(buf, "%-20s %2d%s %-12s %3d%%",
+ Sprintf(buf, iflags.menu_tab_sep ?
+ "%s\t%2d%s\t%s\t%3d%%" : "%-20s %2d%s %-12s %3d%%",
spellname(i), spellev(i),
spellknow(i) ? " " : "*",
spelltypemnemonic(spell_skilltype(spellid(i))),