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

2nd follow-up to alternative fix for menu search (':')

Browse Source
This commit is contained in:
nhmall
2023-11-17 14:13:58 -05:00
parent b3024c3c6c
commit d7ed474fa7
4 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/options.c
View File

@@ -8739,7 +8739,8 @@ doset(void) /* changing options via menu by Per Liboriussen */
menu_item *pick_list;
int indexoffset, startpass, endpass;
boolean setinitial = FALSE, fromfile = FALSE,
gavehelp = FALSE, skiphelp = !iflags.cmdassist;
gavehelp = FALSE, skiphelp = !iflags.cmdassist,
save_bot_disabled;
int clr = NO_COLOR;
if (iflags.menu_requested) {
@@ -8874,6 +8875,8 @@ doset(void) /* changing options via menu by Per Liboriussen */
end_menu(tmpwin, "Set what options?");
go.opt_need_redraw = FALSE;
go.opt_need_glyph_reset = FALSE;
save_bot_disabled = gb.bot_disabled;
gb.bot_disabled = TRUE;
if ((pick_cnt = select_menu(tmpwin, PICK_ANY, &pick_list)) > 0) {
/*
* Walk down the selection list and either invert the booleans
@@ -8930,6 +8933,7 @@ doset(void) /* changing options via menu by Per Liboriussen */
}
destroy_nhwindow(tmpwin);
gb.bot_disabled = save_bot_disabled;
if (pick_cnt == 1 && gavehelp) {
/* when '?' is only the thing selected, go back and pick all

11
src/windows.c
View File

@@ -1679,6 +1679,17 @@ get_menu_coloring(const char *str, int *color, int *attr)
return FALSE;
}
int select_menu(winid window, int how, menu_item **menu_list)
{
int reslt;
boolean old_bot_disabled = gb.bot_disabled;
gb.bot_disabled = TRUE;
reslt = (*windowprocs.win_select_menu)(window, how, menu_list);
gb.bot_disabled = old_bot_disabled;
return reslt;
}
void
getlin(const char *query, register char *bufp)
{