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

'O' tweaks

Browse Source 
Reformat most of optlist.h.  In the process, fix a couple of
conditionally included items which were mis-classified as set_in_game
when excluded.  Add "permablind" as an alias for the "blind" option.
[I don't understand the size value of 70 for #if BACKWARD_COMPAT
{curses,DEC,IBM,Mac}_graphics but didn't alter that.]

Include 'pickup_types' in the behavior section; it's useful from
turn 1 and does get adjusted from time to time during play.

Include 'color' in the map section, but hide it for wc_tiled_map.

Include 'showscore' and 'statuslines=2|3' in the status section.
I didn't rebuild with SCORE_ON_BOTL enabled so the showscore part
hasn't been tested.
This commit is contained in:
PatR
2022-08-04 16:53:31 -07:00
parent 908a8a132f
commit e5ddf400c6
2 changed files with 490 additions and 420 deletions
Download Patch File Download Diff File Expand all files Collapse all files

898
include/optlist.h
View File

File diff suppressed because it is too large Load Diff

12
src/options.c
View File

@@ -7765,7 +7765,7 @@ doset_simple(void)
}
give_opt_msg = FALSE;
rerun:
rerun:
tmpwin = create_nhwindow(NHW_MENU);
start_menu(tmpwin, MENU_BEHAVE_STANDARD);
@@ -7791,6 +7791,8 @@ rerun:
bool_p = allopt[i].addr;
if (!bool_p)
continue;
if (iflags.wc_tiled_map && allopt[i].idx == opt_color)
continue;
Sprintf(buf, fmtstr_doset, "",
name, *bool_p ? "X" : " ");
break;
@@ -7802,7 +7804,8 @@ rerun:
char buf2[BUFSZ];
int k = i;
if (allopt[i].optfn == optfn_symset && Is_rogue_level(&u.uz)) {
if (allopt[i].optfn == optfn_symset
&& Is_rogue_level(&u.uz)) {
k = opt_roguesymset;
name = allopt[k].name;
any.a_int = k + 1;
@@ -7821,6 +7824,11 @@ rerun:
Sprintf(buf, "ERROR");
break;
}
/* pickup_types is separated from autopickup due to the
spelling of their names; emphasize what it means */
if (allopt[i].idx == opt_pickup_types
|| allopt[i].idx == opt_pickup_thrown)
Strcat(buf, " (for autopickup)");
add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0,
ATR_NONE, 0, buf, MENU_ITEMFLAGS_NONE);
}