nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

options.c whitespace cleanup

Browse Source 
I ran into a bit of a mess while working on some other minor change.
Remove trailing spaces and tabs, convert multiple spaces into tabs when
appropriate, discard spaces in <space><tab> sequences, plus a couple of very
small reformatting bits.  No change in game behavior, or even any difference
in generated object file once line information is suppressed.  Some of the
whitespace cleanup is for post-3.4.3 code, so the trunk and branch diffs
aren't equivalent.
This commit is contained in:
nethack.rankin
2005-05-15 05:14:30 +00:00
parent 3b4ca7f6eb
commit 887a97026d
1 changed files with 95 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/options.c
+95 -94
View File
@@ -81,9 +81,9 @@ static struct Bool_Opt
{"clicklook", &iflags.clicklook, FALSE, SET_IN_GAME}, {"clicklook", &iflags.clicklook, FALSE, SET_IN_GAME},
{"cmdassist", &iflags.cmdassist, TRUE, SET_IN_GAME}, {"cmdassist", &iflags.cmdassist, TRUE, SET_IN_GAME},
# if defined(MICRO) || defined(WIN32) # if defined(MICRO) || defined(WIN32)
{"color", &iflags.wc_color,TRUE, SET_IN_GAME}, /*WC*/ {"color", &iflags.wc_color,TRUE, SET_IN_GAME}, /*WC*/
# else /* systems that support multiple terminals, many monochrome */ # else /* systems that support multiple terminals, many monochrome */
{"color", &iflags.wc_color, FALSE, SET_IN_GAME}, /*WC*/ {"color", &iflags.wc_color, FALSE, SET_IN_GAME}, /*WC*/
# endif # endif
{"confirm",&flags.confirm, TRUE, SET_IN_GAME}, {"confirm",&flags.confirm, TRUE, SET_IN_GAME},
#if defined(TERMLIB) && !defined(MAC_GRAPHICS_ENV) #if defined(TERMLIB) && !defined(MAC_GRAPHICS_ENV)
@@ -241,8 +241,8 @@ static struct Comp_Opt
} compopt[] = { } compopt[] = {
{ "align", "your starting alignment (lawful, neutral, or chaotic)", { "align", "your starting alignment (lawful, neutral, or chaotic)",
8, DISP_IN_GAME }, 8, DISP_IN_GAME },
{ "align_message", "message window alignment", 20, DISP_IN_GAME }, /*WC*/ { "align_message", "message window alignment", 20, DISP_IN_GAME }, /*WC*/
{ "align_status", "status window alignment", 20, DISP_IN_GAME }, /*WC*/ { "align_status", "status window alignment", 20, DISP_IN_GAME }, /*WC*/
{ "altkeyhandler", "alternate key handler", 20, DISP_IN_GAME }, { "altkeyhandler", "alternate key handler", 20, DISP_IN_GAME },
{ "boulder", "the symbol to use for displaying boulders", { "boulder", "the symbol to use for displaying boulders",
1, SET_IN_GAME }, 1, SET_IN_GAME },
@@ -528,7 +528,7 @@ initoptions()
/* for detection of configfile options specified multiple times */ /* for detection of configfile options specified multiple times */
iflags.opt_booldup = iflags.opt_compdup = (int *)0; iflags.opt_booldup = iflags.opt_compdup = (int *)0;
for (i = 0; boolopt[i].name; i++) { for (i = 0; boolopt[i].name; i++) {
if (boolopt[i].addr) if (boolopt[i].addr)
*(boolopt[i].addr) = boolopt[i].initvalue; *(boolopt[i].addr) = boolopt[i].initvalue;
@@ -953,7 +953,7 @@ int on_or_off;
optptr = iflags.opt_booldup; optptr = iflags.opt_booldup;
for (k = 0; k < SIZE(boolopt); ++k) for (k = 0; k < SIZE(boolopt); ++k)
*optptr++ = 0; *optptr++ = 0;
if (iflags.opt_compdup) if (iflags.opt_compdup)
impossible("iflags.opt_compdup already on (memory leak)"); impossible("iflags.opt_compdup already on (memory leak)");
iflags.opt_compdup = (int *)alloc(SIZE(compopt) * sizeof(int)); iflags.opt_compdup = (int *)alloc(SIZE(compopt) * sizeof(int));
@@ -966,7 +966,7 @@ int on_or_off;
iflags.opt_booldup = (int *)0; iflags.opt_booldup = (int *)0;
if (iflags.opt_compdup) free((genericptr_t) iflags.opt_compdup); if (iflags.opt_compdup) free((genericptr_t) iflags.opt_compdup);
iflags.opt_compdup = (int *)0; iflags.opt_compdup = (int *)0;
} }
} }
STATIC_OVL boolean STATIC_OVL boolean
@@ -1284,7 +1284,7 @@ boolean tinitial, tfrom_file;
if (match_optname(opts, fullname, 4, TRUE)) { if (match_optname(opts, fullname, 4, TRUE)) {
if (duplicate) complain_about_duplicate(opts,1); if (duplicate) complain_about_duplicate(opts,1);
if (negated) { if (negated) {
flags.runmode = RUN_TPORT; flags.runmode = RUN_TPORT;
} else if ((op = string_for_opt(opts, FALSE)) != 0) { } else if ((op = string_for_opt(opts, FALSE)) != 0) {
if (!strncmpi(op, "teleport", strlen(op))) if (!strncmpi(op, "teleport", strlen(op)))
flags.runmode = RUN_TPORT; flags.runmode = RUN_TPORT;
@@ -1320,10 +1320,10 @@ boolean tinitial, tfrom_file;
if (!(op = string_for_opt(opts, TRUE))) { if (!(op = string_for_opt(opts, TRUE))) {
tmp = negated ? 's' : 'f'; tmp = negated ? 's' : 'f';
} else { } else {
if (negated) { if (negated) {
bad_negation(fullname, TRUE); bad_negation(fullname, TRUE);
return; return;
} }
tmp = tolower(*op); tmp = tolower(*op);
} }
switch (tmp) { switch (tmp) {
@@ -1349,8 +1349,7 @@ boolean tinitial, tfrom_file;
/* WINCAP /* WINCAP
* setting font options */ * setting font options */
fullname = "font"; fullname = "font";
if (!strncmpi(opts, fullname, 4)) if (!strncmpi(opts, fullname, 4)) {
{
int opttype = -1; int opttype = -1;
char *fontopts = opts + 4; char *fontopts = opts + 4;
@@ -1362,7 +1361,7 @@ boolean tinitial, tfrom_file;
opttype = MESSAGE_OPTION; opttype = MESSAGE_OPTION;
else if (!strncmpi(fontopts, "text", 4) || else if (!strncmpi(fontopts, "text", 4) ||
!strncmpi(fontopts, "_text", 5)) !strncmpi(fontopts, "_text", 5))
opttype = TEXT_OPTION; opttype = TEXT_OPTION;
else if (!strncmpi(fontopts, "menu", 4) || else if (!strncmpi(fontopts, "menu", 4) ||
!strncmpi(fontopts, "_menu", 5)) !strncmpi(fontopts, "_menu", 5))
opttype = MENU_OPTION; opttype = MENU_OPTION;
@@ -1388,19 +1387,19 @@ boolean tinitial, tfrom_file;
if (opttype > 0 && !negated && if (opttype > 0 && !negated &&
(op = string_for_opt(opts, FALSE)) != 0) { (op = string_for_opt(opts, FALSE)) != 0) {
switch(opttype) { switch(opttype) {
case MAP_OPTION: case MAP_OPTION:
iflags.wc_fontsiz_map = atoi(op); iflags.wc_fontsiz_map = atoi(op);
break; break;
case MESSAGE_OPTION: case MESSAGE_OPTION:
iflags.wc_fontsiz_message = atoi(op); iflags.wc_fontsiz_message = atoi(op);
break; break;
case TEXT_OPTION: case TEXT_OPTION:
iflags.wc_fontsiz_text = atoi(op); iflags.wc_fontsiz_text = atoi(op);
break; break;
case MENU_OPTION: case MENU_OPTION:
iflags.wc_fontsiz_menu = atoi(op); iflags.wc_fontsiz_menu = atoi(op);
break; break;
case STATUS_OPTION: case STATUS_OPTION:
iflags.wc_fontsiz_status = atoi(op); iflags.wc_fontsiz_status = atoi(op);
break; break;
} }
@@ -1853,7 +1852,7 @@ goodfruit:
else if (!strncmpi (op, "prompt", sizeof("prompt")-1)) else if (!strncmpi (op, "prompt", sizeof("prompt")-1))
iflags.wc_player_selection = VIA_PROMPTS; iflags.wc_player_selection = VIA_PROMPTS;
else else
badoption(opts); badoption(opts);
} else if (negated) bad_negation(fullname, TRUE); } else if (negated) bad_negation(fullname, TRUE);
return; return;
} }
@@ -1929,9 +1928,9 @@ goodfruit:
} else if (index(valid_settings, c)) { } else if (index(valid_settings, c)) {
prefix_val = c; prefix_val = c;
} else if (c == ' ') { } else if (c == ' ') {
/* do nothing */ ; /* do nothing */
} else } else
badopt = TRUE; badopt = TRUE;
op++; op++;
} }
if (badopt) badoption(opts); if (badopt) badoption(opts);
@@ -1986,7 +1985,7 @@ goodfruit:
else if (op) (void) feature_alert_opts(op,fullname); else if (op) (void) feature_alert_opts(op,fullname);
return; return;
} }
#ifdef VIDEOSHADES #ifdef VIDEOSHADES
/* videocolors:string */ /* videocolors:string */
fullname = "videocolors"; fullname = "videocolors";
@@ -2086,7 +2085,7 @@ goodfruit:
else if (!strncmpi (op, "fit_to_screen", sizeof("fit_to_screen")-1)) else if (!strncmpi (op, "fit_to_screen", sizeof("fit_to_screen")-1))
iflags.wc_map_mode = MAP_MODE_ASCII_FIT_TO_SCREEN; iflags.wc_map_mode = MAP_MODE_ASCII_FIT_TO_SCREEN;
else else
badoption(opts); badoption(opts);
} else if (negated) bad_negation(fullname, TRUE); } else if (negated) bad_negation(fullname, TRUE);
return; return;
} }
@@ -2185,8 +2184,8 @@ goodfruit:
/* WINCAP /* WINCAP
* setting window colors * setting window colors
* syntax: windowcolors=menu foregrnd/backgrnd text foregrnd/backgrnd * syntax: windowcolors=menu foregrnd/backgrnd text foregrnd/backgrnd
*/ */
fullname = "windowcolors"; fullname = "windowcolors";
if (match_optname(opts, fullname, 7, TRUE)) { if (match_optname(opts, fullname, 7, TRUE)) {
if (duplicate) complain_about_duplicate(opts,1); if (duplicate) complain_about_duplicate(opts,1);
@@ -2518,7 +2517,7 @@ map_menu_cmd(ch)
# define OPTIONS_HEADING "NETHACKOPTIONS" # define OPTIONS_HEADING "NETHACKOPTIONS"
#endif #endif
static char fmtstr_doset_add_menu[] = "%s%-15s [%s] "; static char fmtstr_doset_add_menu[] = "%s%-15s [%s] ";
static char fmtstr_doset_add_menu_tab[] = "%s\t[%s]"; static char fmtstr_doset_add_menu_tab[] = "%s\t[%s]";
STATIC_OVL void STATIC_OVL void
@@ -2577,7 +2576,7 @@ doset()
start_menu(tmpwin); start_menu(tmpwin);
any.a_void = 0; any.a_void = 0;
add_menu(tmpwin, NO_GLYPH, &any, 0, 0, iflags.menu_headings, add_menu(tmpwin, NO_GLYPH, &any, 0, 0, iflags.menu_headings,
"Booleans (selecting will toggle value):", MENU_UNSELECTED); "Booleans (selecting will toggle value):", MENU_UNSELECTED);
any.a_int = 0; any.a_int = 0;
/* first list any other non-modifiable booleans, then modifiable ones */ /* first list any other non-modifiable booleans, then modifiable ones */
@@ -2600,7 +2599,7 @@ doset()
Sprintf(buf, "%s%-13s [%s]", Sprintf(buf, "%s%-13s [%s]",
pass == 0 ? " " : "", pass == 0 ? " " : "",
boolopt[i].name, *bool_p ? "true" : "false"); boolopt[i].name, *bool_p ? "true" : "false");
else else
Sprintf(buf, "%s\t[%s]", Sprintf(buf, "%s\t[%s]",
boolopt[i].name, *bool_p ? "true" : "false"); boolopt[i].name, *bool_p ? "true" : "false");
add_menu(tmpwin, NO_GLYPH, &any, 0, 0, add_menu(tmpwin, NO_GLYPH, &any, 0, 0,
@@ -2611,7 +2610,7 @@ doset()
indexoffset = boolcount; indexoffset = boolcount;
any.a_void = 0; any.a_void = 0;
add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE, "", MENU_UNSELECTED); add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE, "", MENU_UNSELECTED);
add_menu(tmpwin, NO_GLYPH, &any, 0, 0, iflags.menu_headings, add_menu(tmpwin, NO_GLYPH, &any, 0, 0, iflags.menu_headings,
"Compounds (selecting will prompt for new value):", "Compounds (selecting will prompt for new value):",
MENU_UNSELECTED); MENU_UNSELECTED);
@@ -2619,7 +2618,7 @@ doset()
endpass = SET_IN_GAME; endpass = SET_IN_GAME;
/* spin through the options to find the biggest name /* spin through the options to find the biggest name
and adjust the format string accordingly if needed */ and adjust the format string accordingly if needed */
biggest_name = 0; biggest_name = 0;
for (i = 0; compopt[i].name; i++) for (i = 0; compopt[i].name; i++)
if (compopt[i].optflags >= startpass && compopt[i].optflags <= endpass && if (compopt[i].optflags >= startpass && compopt[i].optflags <= endpass &&
@@ -2628,28 +2627,28 @@ doset()
if (biggest_name > 30) biggest_name = 30; if (biggest_name > 30) biggest_name = 30;
if (!iflags.menu_tab_sep) if (!iflags.menu_tab_sep)
Sprintf(fmtstr_doset_add_menu, "%%s%%-%ds [%%s]", biggest_name); Sprintf(fmtstr_doset_add_menu, "%%s%%-%ds [%%s]", biggest_name);
/* deliberately put `name', `role', `race', `gender' first */ /* deliberately put `name', `role', `race', `gender' first */
doset_add_menu(tmpwin, "name", 0); doset_add_menu(tmpwin, "name", 0);
doset_add_menu(tmpwin, "role", 0); doset_add_menu(tmpwin, "role", 0);
doset_add_menu(tmpwin, "race", 0); doset_add_menu(tmpwin, "race", 0);
doset_add_menu(tmpwin, "gender", 0); doset_add_menu(tmpwin, "gender", 0);
for (pass = startpass; pass <= endpass; pass++) for (pass = startpass; pass <= endpass; pass++)
for (i = 0; compopt[i].name; i++) for (i = 0; compopt[i].name; i++)
if (compopt[i].optflags == pass) { if (compopt[i].optflags == pass) {
if (!strcmp(compopt[i].name, "name") || if (!strcmp(compopt[i].name, "name") ||
!strcmp(compopt[i].name, "role") || !strcmp(compopt[i].name, "role") ||
!strcmp(compopt[i].name, "race") || !strcmp(compopt[i].name, "race") ||
!strcmp(compopt[i].name, "gender")) !strcmp(compopt[i].name, "gender"))
continue; continue;
else if (is_wc_option(compopt[i].name) && else if (is_wc_option(compopt[i].name) &&
!wc_supported(compopt[i].name)) !wc_supported(compopt[i].name))
continue; continue;
else if (is_wc2_option(compopt[i].name) && else if (is_wc2_option(compopt[i].name) &&
!wc2_supported(compopt[i].name)) !wc2_supported(compopt[i].name))
continue; continue;
else else
doset_add_menu(tmpwin, compopt[i].name, doset_add_menu(tmpwin, compopt[i].name,
(pass == DISP_IN_GAME) ? 0 : indexoffset); (pass == DISP_IN_GAME) ? 0 : indexoffset);
} }
@@ -2692,8 +2691,8 @@ doset()
opt_indx = pick_list[pick_idx].item.a_int - 1; opt_indx = pick_list[pick_idx].item.a_int - 1;
#ifdef AUTOPICKUP_EXCEPTIONS #ifdef AUTOPICKUP_EXCEPTIONS
if (opt_indx == -2) { /* -3 due to -1 offset for select_menu() */ if (opt_indx == -2) { /* -3 due to -1 offset for select_menu() */
special_handling("autopickup_exception", (void)special_handling("autopickup_exception",
setinitial, fromfile); setinitial, fromfile);
} else } else
#endif #endif
#ifdef STATUS_VIA_WINDOWPORT #ifdef STATUS_VIA_WINDOWPORT
@@ -2702,7 +2701,7 @@ doset()
if (!status_hilite_menu()) if (!status_hilite_menu())
pline("Bad status hilite(s) specified."); pline("Bad status hilite(s) specified.");
else { else {
if (wc2_supported("status_hilites")) if (wc2_supported("status_hilites"))
preference_update("status_hilites"); preference_update("status_hilites");
} }
} else } else
@@ -2714,7 +2713,7 @@ doset()
boolopt[opt_indx].name); boolopt[opt_indx].name);
parseoptions(buf, setinitial, fromfile); parseoptions(buf, setinitial, fromfile);
if (wc_supported(boolopt[opt_indx].name) || if (wc_supported(boolopt[opt_indx].name) ||
wc2_supported(boolopt[opt_indx].name)) wc2_supported(boolopt[opt_indx].name))
preference_update(boolopt[opt_indx].name); preference_update(boolopt[opt_indx].name);
} else { } else {
/* compound option */ /* compound option */
@@ -2755,7 +2754,7 @@ boolean setinitial,setfromfile;
int i; int i;
char buf[BUFSZ]; char buf[BUFSZ];
boolean retval = FALSE; boolean retval = FALSE;
/* Special handling of menustyle, pickup_burden, pickup_types, /* Special handling of menustyle, pickup_burden, pickup_types,
* disclose, runmode, msg_window, menu_headings, and number_pad options. * disclose, runmode, msg_window, menu_headings, and number_pad options.
#ifdef AUTOPICKUP_EXCEPTIONS #ifdef AUTOPICKUP_EXCEPTIONS
@@ -2765,34 +2764,34 @@ boolean setinitial,setfromfile;
if (!strcmp("menustyle", optname)) { if (!strcmp("menustyle", optname)) {
const char *style_name; const char *style_name;
menu_item *style_pick = (menu_item *)0; menu_item *style_pick = (menu_item *)0;
tmpwin = create_nhwindow(NHW_MENU); tmpwin = create_nhwindow(NHW_MENU);
start_menu(tmpwin); start_menu(tmpwin);
for (i = 0; i < SIZE(menutype); i++) { for (i = 0; i < SIZE(menutype); i++) {
style_name = menutype[i]; style_name = menutype[i];
/* note: separate `style_name' variable used /* note: separate `style_name' variable used
to avoid an optimizer bug in VAX C V2.3 */ to avoid an optimizer bug in VAX C V2.3 */
any.a_int = i + 1; any.a_int = i + 1;
add_menu(tmpwin, NO_GLYPH, &any, *style_name, 0, add_menu(tmpwin, NO_GLYPH, &any, *style_name, 0,
ATR_NONE, style_name, MENU_UNSELECTED); ATR_NONE, style_name, MENU_UNSELECTED);
} }
end_menu(tmpwin, "Select menustyle:"); end_menu(tmpwin, "Select menustyle:");
if (select_menu(tmpwin, PICK_ONE, &style_pick) > 0) { if (select_menu(tmpwin, PICK_ONE, &style_pick) > 0) {
flags.menu_style = style_pick->item.a_int - 1; flags.menu_style = style_pick->item.a_int - 1;
free((genericptr_t)style_pick); free((genericptr_t)style_pick);
} }
destroy_nhwindow(tmpwin); destroy_nhwindow(tmpwin);
retval = TRUE; retval = TRUE;
} else if (!strcmp("pickup_burden", optname)) { } else if (!strcmp("pickup_burden", optname)) {
const char *burden_name, *burden_letters = "ubsntl"; const char *burden_name, *burden_letters = "ubsntl";
menu_item *burden_pick = (menu_item *)0; menu_item *burden_pick = (menu_item *)0;
tmpwin = create_nhwindow(NHW_MENU); tmpwin = create_nhwindow(NHW_MENU);
start_menu(tmpwin); start_menu(tmpwin);
for (i = 0; i < SIZE(burdentype); i++) { for (i = 0; i < SIZE(burdentype); i++) {
burden_name = burdentype[i]; burden_name = burdentype[i];
any.a_int = i + 1; any.a_int = i + 1;
add_menu(tmpwin, NO_GLYPH, &any, burden_letters[i], 0, add_menu(tmpwin, NO_GLYPH, &any, burden_letters[i], 0,
ATR_NONE, burden_name, MENU_UNSELECTED); ATR_NONE, burden_name, MENU_UNSELECTED);
} }
end_menu(tmpwin, "Select encumbrance level:"); end_menu(tmpwin, "Select encumbrance level:");
if (select_menu(tmpwin, PICK_ONE, &burden_pick) > 0) { if (select_menu(tmpwin, PICK_ONE, &burden_pick) > 0) {
flags.pickup_burden = burden_pick->item.a_int - 1; flags.pickup_burden = burden_pick->item.a_int - 1;
@@ -2809,15 +2808,15 @@ boolean setinitial,setfromfile;
menu_item *disclosure_category_pick = (menu_item *)0; menu_item *disclosure_category_pick = (menu_item *)0;
/* /*
* The order of disclose_names[] * The order of disclose_names[]
* must correspond to disclosure_options in decl.h * must correspond to disclosure_options in decl.h
*/ */
static const char *disclosure_names[] = { static const char *disclosure_names[] = {
"inventory", "attributes", "vanquished", "genocides", "conduct" "inventory", "attributes", "vanquished", "genocides", "conduct"
}; };
int disc_cat[NUM_DISCLOSURE_OPTIONS]; int disc_cat[NUM_DISCLOSURE_OPTIONS];
const char *disclosure_name; const char *disclosure_name;
tmpwin = create_nhwindow(NHW_MENU); tmpwin = create_nhwindow(NHW_MENU);
start_menu(tmpwin); start_menu(tmpwin);
for (i = 0; i < NUM_DISCLOSURE_OPTIONS; i++) { for (i = 0; i < NUM_DISCLOSURE_OPTIONS; i++) {
disclosure_name = disclosure_names[i]; disclosure_name = disclosure_names[i];
@@ -2825,7 +2824,7 @@ boolean setinitial,setfromfile;
add_menu(tmpwin, NO_GLYPH, &any, disclosure_options[i], 0, add_menu(tmpwin, NO_GLYPH, &any, disclosure_options[i], 0,
ATR_NONE, disclosure_name, MENU_UNSELECTED); ATR_NONE, disclosure_name, MENU_UNSELECTED);
disc_cat[i] = 0; disc_cat[i] = 0;
} }
end_menu(tmpwin, "Change which disclosure options categories:"); end_menu(tmpwin, "Change which disclosure options categories:");
if ((pick_cnt = select_menu(tmpwin, PICK_ANY, &disclosure_category_pick)) > 0) { if ((pick_cnt = select_menu(tmpwin, PICK_ANY, &disclosure_category_pick)) > 0) {
for (pick_idx = 0; pick_idx < pick_cnt; ++pick_idx) { for (pick_idx = 0; pick_idx < pick_cnt; ++pick_idx) {
@@ -2839,10 +2838,11 @@ boolean setinitial,setfromfile;
for (i = 0; i < NUM_DISCLOSURE_OPTIONS; i++) { for (i = 0; i < NUM_DISCLOSURE_OPTIONS; i++) {
if (disc_cat[i]) { if (disc_cat[i]) {
char dbuf[BUFSZ]; char dbuf[BUFSZ];
menu_item *disclosure_option_pick = (menu_item *)0; menu_item *disclosure_option_pick = (menu_item *)0;
Sprintf(dbuf, "Disclosure options for %s:", disclosure_names[i]); Sprintf(dbuf, "Disclosure options for %s:", disclosure_names[i]);
tmpwin = create_nhwindow(NHW_MENU); tmpwin = create_nhwindow(NHW_MENU);
start_menu(tmpwin); start_menu(tmpwin);
any.a_char = DISCLOSE_NO_WITHOUT_PROMPT; any.a_char = DISCLOSE_NO_WITHOUT_PROMPT;
add_menu(tmpwin, NO_GLYPH, &any, 'a', 0, add_menu(tmpwin, NO_GLYPH, &any, 'a', 0,
@@ -2886,7 +2886,7 @@ boolean setinitial,setfromfile;
} }
destroy_nhwindow(tmpwin); destroy_nhwindow(tmpwin);
retval = TRUE; retval = TRUE;
} }
#ifdef TTY_GRAPHICS #ifdef TTY_GRAPHICS
else if (!strcmp("msg_window", optname)) { else if (!strcmp("msg_window", optname)) {
/* by Christian W. Cooper */ /* by Christian W. Cooper */
@@ -2911,7 +2911,7 @@ boolean setinitial,setfromfile;
free((genericptr_t)window_pick); free((genericptr_t)window_pick);
} }
destroy_nhwindow(tmpwin); destroy_nhwindow(tmpwin);
retval = TRUE; retval = TRUE;
} }
#endif #endif
else if (!strcmp("align_message", optname) || else if (!strcmp("align_message", optname) ||
@@ -2937,13 +2937,13 @@ boolean setinitial,setfromfile;
Sprintf(abuf, "Select %s window placement relative to the map:", Sprintf(abuf, "Select %s window placement relative to the map:",
msg ? "message" : "status"); msg ? "message" : "status");
end_menu(tmpwin, abuf); end_menu(tmpwin, abuf);
if (select_menu(tmpwin, PICK_ONE, &window_pick) > 0) { if (select_menu(tmpwin, PICK_ONE, &window_pick) > 0) {
if (msg) iflags.wc_align_message = window_pick->item.a_int; if (msg) iflags.wc_align_message = window_pick->item.a_int;
else iflags.wc_align_status = window_pick->item.a_int; else iflags.wc_align_status = window_pick->item.a_int;
free((genericptr_t)window_pick); free((genericptr_t)window_pick);
} }
destroy_nhwindow(tmpwin); destroy_nhwindow(tmpwin);
retval = TRUE; retval = TRUE;
} else if (!strcmp("number_pad", optname)) { } else if (!strcmp("number_pad", optname)) {
static const char *npchoices[3] = static const char *npchoices[3] =
{"0 (off)", "1 (on)", "2 (on, DOS compatible)"}; {"0 (off)", "1 (on)", "2 (on, DOS compatible)"};
@@ -2956,7 +2956,7 @@ boolean setinitial,setfromfile;
any.a_int = i + 1; any.a_int = i + 1;
add_menu(tmpwin, NO_GLYPH, &any, npletters[i], 0, add_menu(tmpwin, NO_GLYPH, &any, npletters[i], 0,
ATR_NONE, npchoices[i], MENU_UNSELECTED); ATR_NONE, npchoices[i], MENU_UNSELECTED);
} }
end_menu(tmpwin, "Select number_pad mode:"); end_menu(tmpwin, "Select number_pad mode:");
if (select_menu(tmpwin, PICK_ONE, &mode_pick) > 0) { if (select_menu(tmpwin, PICK_ONE, &mode_pick) > 0) {
int mode = mode_pick->item.a_int - 1; int mode = mode_pick->item.a_int - 1;
@@ -2975,9 +2975,9 @@ boolean setinitial,setfromfile;
iflags.num_pad_mode = 0; iflags.num_pad_mode = 0;
} }
free((genericptr_t)mode_pick); free((genericptr_t)mode_pick);
} }
destroy_nhwindow(tmpwin); destroy_nhwindow(tmpwin);
retval = TRUE; retval = TRUE;
} else if (!strcmp("menu_headings", optname)) { } else if (!strcmp("menu_headings", optname)) {
static const char *mhchoices[3] = {"bold", "inverse", "underline"}; static const char *mhchoices[3] = {"bold", "inverse", "underline"};
const char *npletters = "biu"; const char *npletters = "biu";
@@ -2989,7 +2989,7 @@ boolean setinitial,setfromfile;
any.a_int = i + 1; any.a_int = i + 1;
add_menu(tmpwin, NO_GLYPH, &any, npletters[i], 0, add_menu(tmpwin, NO_GLYPH, &any, npletters[i], 0,
ATR_NONE, mhchoices[i], MENU_UNSELECTED); ATR_NONE, mhchoices[i], MENU_UNSELECTED);
} }
end_menu(tmpwin, "How to highlight menu headings:"); end_menu(tmpwin, "How to highlight menu headings:");
if (select_menu(tmpwin, PICK_ONE, &mode_pick) > 0) { if (select_menu(tmpwin, PICK_ONE, &mode_pick) > 0) {
int mode = mode_pick->item.a_int - 1; int mode = mode_pick->item.a_int - 1;
@@ -3005,12 +3005,12 @@ boolean setinitial,setfromfile;
iflags.menu_headings = ATR_INVERSE; iflags.menu_headings = ATR_INVERSE;
} }
free((genericptr_t)mode_pick); free((genericptr_t)mode_pick);
} }
destroy_nhwindow(tmpwin); destroy_nhwindow(tmpwin);
retval = TRUE; retval = TRUE;
#ifdef AUTOPICKUP_EXCEPTIONS #ifdef AUTOPICKUP_EXCEPTIONS
} else if (!strcmp("autopickup_exception", optname)) { } else if (!strcmp("autopickup_exception", optname)) {
boolean retval; boolean retval;
int pick_cnt, pick_idx, opt_idx, pass; int pick_cnt, pick_idx, opt_idx, pass;
int totalapes = 0, numapes[2] = {0,0}; int totalapes = 0, numapes[2] = {0,0};
menu_item *pick_list = (menu_item *)0; menu_item *pick_list = (menu_item *)0;
@@ -3023,7 +3023,8 @@ boolean setinitial,setfromfile;
"r", "remove existing autopickup exception", "r", "remove existing autopickup exception",
"e", "exit this menu", "e", "exit this menu",
}; };
ape_again:
ape_again:
opt_idx = 0; opt_idx = 0;
totalapes = count_ape_maps(&numapes[AP_LEAVE], &numapes[AP_GRAB]); totalapes = count_ape_maps(&numapes[AP_LEAVE], &numapes[AP_GRAB]);
tmpwin = create_nhwindow(NHW_MENU); tmpwin = create_nhwindow(NHW_MENU);
@@ -3034,7 +3035,7 @@ ape_again:
if (!totalapes && (i >= 2 && i < 6)) continue; if (!totalapes && (i >= 2 && i < 6)) continue;
add_menu(tmpwin, NO_GLYPH, &any, *action_titles[i], add_menu(tmpwin, NO_GLYPH, &any, *action_titles[i],
0, ATR_NONE, action_titles[i+1], MENU_UNSELECTED); 0, ATR_NONE, action_titles[i+1], MENU_UNSELECTED);
} }
end_menu(tmpwin, "Do what?"); end_menu(tmpwin, "Do what?");
if ((pick_cnt = select_menu(tmpwin, PICK_ONE, &pick_list)) > 0) { if ((pick_cnt = select_menu(tmpwin, PICK_ONE, &pick_list)) > 0) {
for (pick_idx = 0; pick_idx < pick_cnt; ++pick_idx) { for (pick_idx = 0; pick_idx < pick_cnt; ++pick_idx) {
@@ -3080,12 +3081,12 @@ ape_again:
(opt_idx == 1) ? PICK_NONE : PICK_ANY, (opt_idx == 1) ? PICK_NONE : PICK_ANY,
&pick_list); &pick_list);
if (pick_cnt > 0) { if (pick_cnt > 0) {
for (pick_idx = 0; pick_idx < pick_cnt; ++pick_idx) for (pick_idx = 0; pick_idx < pick_cnt; ++pick_idx)
remove_autopickup_exception( remove_autopickup_exception(
(struct autopickup_exception *)pick_list[pick_idx].item.a_void); (struct autopickup_exception *)pick_list[pick_idx].item.a_void);
} }
free((genericptr_t)pick_list); free((genericptr_t)pick_list);
pick_list = (menu_item *)0; pick_list = (menu_item *)0;
destroy_nhwindow(tmpwin); destroy_nhwindow(tmpwin);
goto ape_again; goto ape_again;
} }
@@ -3135,7 +3136,7 @@ char *buf;
else if (!strcmp(optname, "boulder")) else if (!strcmp(optname, "boulder"))
Sprintf(buf, "%c", iflags.bouldersym ? Sprintf(buf, "%c", iflags.bouldersym ?
iflags.bouldersym : oc_syms[(int)objects[BOULDER].oc_class]); iflags.bouldersym : oc_syms[(int)objects[BOULDER].oc_class]);
else if (!strcmp(optname, "catname")) else if (!strcmp(optname, "catname"))
Sprintf(buf, "%s", catname[0] ? catname : none ); Sprintf(buf, "%s", catname[0] ? catname : none );
else if (!strcmp(optname, "disclose")) { else if (!strcmp(optname, "disclose")) {
for (i = 0; i < NUM_DISCLOSURE_OPTIONS; i++) { for (i = 0; i < NUM_DISCLOSURE_OPTIONS; i++) {
@@ -3148,7 +3149,7 @@ char *buf;
Strcat(buf, topt); Strcat(buf, topt);
} }
} }
else if (!strcmp(optname, "dogname")) else if (!strcmp(optname, "dogname"))
Sprintf(buf, "%s", dogname[0] ? dogname : none ); Sprintf(buf, "%s", dogname[0] ? dogname : none );
else if (!strcmp(optname, "dungeon")) else if (!strcmp(optname, "dungeon"))
Sprintf(buf, "%s", to_be_done); Sprintf(buf, "%s", to_be_done);
@@ -3185,11 +3186,11 @@ char *buf;
if (iflags.wc_fontsiz_text) Sprintf(buf, "%d",iflags.wc_fontsiz_text); if (iflags.wc_fontsiz_text) Sprintf(buf, "%d",iflags.wc_fontsiz_text);
else Strcpy(buf, defopt); else Strcpy(buf, defopt);
} }
else if (!strcmp(optname, "fruit")) else if (!strcmp(optname, "fruit"))
Sprintf(buf, "%s", pl_fruit); Sprintf(buf, "%s", pl_fruit);
else if (!strcmp(optname, "gender")) else if (!strcmp(optname, "gender"))
Sprintf(buf, "%s", rolestring(flags.initgend, genders, adj)); Sprintf(buf, "%s", rolestring(flags.initgend, genders, adj));
else if (!strcmp(optname, "horsename")) else if (!strcmp(optname, "horsename"))
Sprintf(buf, "%s", horsename[0] ? horsename : none); Sprintf(buf, "%s", horsename[0] ? horsename : none);
else if (!strcmp(optname, "map_mode")) else if (!strcmp(optname, "map_mode"))
Sprintf(buf, "%s", Sprintf(buf, "%s",
@@ -3205,7 +3206,7 @@ char *buf;
iflags.wc_map_mode == MAP_MODE_ASCII10x18 ? "ascii10x18" : iflags.wc_map_mode == MAP_MODE_ASCII10x18 ? "ascii10x18" :
iflags.wc_map_mode == MAP_MODE_ASCII_FIT_TO_SCREEN ? iflags.wc_map_mode == MAP_MODE_ASCII_FIT_TO_SCREEN ?
"fit_to_screen" : defopt); "fit_to_screen" : defopt);
else if (!strcmp(optname, "menustyle")) else if (!strcmp(optname, "menustyle"))
Sprintf(buf, "%s", menutype[(int)flags.menu_style] ); Sprintf(buf, "%s", menutype[(int)flags.menu_style] );
else if (!strcmp(optname, "menu_deselect_all")) else if (!strcmp(optname, "menu_deselect_all"))
Sprintf(buf, "%s", to_be_done); Sprintf(buf, "%s", to_be_done);
@@ -3258,10 +3259,10 @@ char *buf;
Sprintf(buf, "%s", ocl); Sprintf(buf, "%s", ocl);
} }
#ifdef CHANGE_COLOR #ifdef CHANGE_COLOR
else if (!strcmp(optname, "palette")) else if (!strcmp(optname, "palette"))
Sprintf(buf, "%s", get_color_string()); Sprintf(buf, "%s", get_color_string());
#endif #endif
else if (!strcmp(optname, "pettype")) else if (!strcmp(optname, "pettype"))
Sprintf(buf, "%s", (preferred_pet == 'c') ? "cat" : Sprintf(buf, "%s", (preferred_pet == 'c') ? "cat" :
(preferred_pet == 'd') ? "dog" : (preferred_pet == 'd') ? "dog" :
(preferred_pet == 'n') ? "none" : "random"); (preferred_pet == 'n') ? "none" : "random");
@@ -3679,7 +3680,7 @@ nonew:
* The title at the top of the menu. * The title at the top of the menu.
* *
* category: 0 = monster class * category: 0 = monster class
* 1 = object class * 1 = object class
* *
* way * way
* FALSE = PICK_ONE, TRUE = PICK_ANY * FALSE = PICK_ONE, TRUE = PICK_ANY
@@ -3969,22 +3970,22 @@ char *fontname;
if (!fontname) return; if (!fontname) return;
switch(opttype) { switch(opttype) {
case MAP_OPTION: case MAP_OPTION:
fn = &iflags.wc_font_map; fn = &iflags.wc_font_map;
break; break;
case MESSAGE_OPTION: case MESSAGE_OPTION:
fn = &iflags.wc_font_message; fn = &iflags.wc_font_message;
break; break;
case TEXT_OPTION: case TEXT_OPTION:
fn = &iflags.wc_font_text; fn = &iflags.wc_font_text;
break; break;
case MENU_OPTION: case MENU_OPTION:
fn = &iflags.wc_font_menu; fn = &iflags.wc_font_menu;
break; break;
case STATUS_OPTION: case STATUS_OPTION:
fn = &iflags.wc_font_status; fn = &iflags.wc_font_status;
break; break;
default: default:
return; return;
} }
if (fn) { if (fn) {
if (*fn) free(*fn); if (*fn) free(*fn);
@@ -4070,7 +4071,7 @@ char *op;
*bgp[j] = (char *)alloc(strlen(tbg) + 1); *bgp[j] = (char *)alloc(strlen(tbg) + 1);
Strcpy(*bgp[j], tbg); Strcpy(*bgp[j], tbg);
} }
break; break;
} }
} }
} }