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

Simplify add_menu, part 6

Browse Source
This commit is contained in:
Pasi Kallinen
2023-11-03 21:48:46 +02:00
parent 93fd946ff6
commit 70c47c4054
2 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nhlua.c
+1 -3
View File
@@ -788,7 +788,6 @@ nhl_text(lua_State *L)
if (argc > 0) { if (argc > 0) {
menu_item *picks = (menu_item *) 0; menu_item *picks = (menu_item *) 0;
winid tmpwin; winid tmpwin;
anything any = cg.zeroany;
tmpwin = create_nhwindow(NHW_MENU); tmpwin = create_nhwindow(NHW_MENU);
start_menu(tmpwin, MENU_BEHAVE_STANDARD); start_menu(tmpwin, MENU_BEHAVE_STANDARD);
@@ -811,8 +810,7 @@ nhl_text(lua_State *L)
while ((ptr > str) && !(*ptr == ' ' || *ptr == '\n')) while ((ptr > str) && !(*ptr == ' ' || *ptr == '\n'))
ptr--; ptr--;
*ptr = '\0'; *ptr = '\0';
add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE, 0, add_menu_str(tmpwin, str);
str, MENU_ITEMFLAGS_NONE);
str = ptr + 1; str = ptr + 1;
} while (*str && str <= lstr); } while (*str && str <= lstr);
lua_pop(L, 1); lua_pop(L, 1);
src/o_init.c
+7 -12
View File
@@ -592,18 +592,13 @@ choose_disco_sort(
/* called via 'm `' where full alphabetize doesn't make sense /* called via 'm `' where full alphabetize doesn't make sense
(only showing one class so can't span all classes) but the (only showing one class so can't span all classes) but the
chosen sort will stick and also apply to '\' usage */ chosen sort will stick and also apply to '\' usage */
any = cg.zeroany; add_menu_str(tmpwin, "");
add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE, clr, add_menu_str(tmpwin,
"", MENU_ITEMFLAGS_NONE); "Note: full alphabetical and alphabetical within class");
add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE, clr, add_menu_str(tmpwin,
"Note: full alphabetical and alphabetical within class", " are equivalent for single class discovery, but");
MENU_ITEMFLAGS_NONE); add_menu_str(tmpwin,
add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE, clr, " will matter for future use of total discoveries.");
" are equivalent for single class discovery, but",
MENU_ITEMFLAGS_NONE);
add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE, clr,
" will matter for future use of total discoveries.",
MENU_ITEMFLAGS_NONE);
} }
end_menu(tmpwin, "Ordering of discoveries"); end_menu(tmpwin, "Ordering of discoveries");