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

Query menu for hide or spin web monster ability

Browse Source
This commit is contained in:
Pasi Kallinen
2024-06-17 18:12:12 +03:00
parent c2f717cd65
commit 078e22be2e
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/decl.h
+1
View File
@@ -85,6 +85,7 @@ extern const char ynqchars[];
extern const char ynaqchars[]; extern const char ynaqchars[];
extern const char ynNaqchars[]; extern const char ynNaqchars[];
extern const char rightleftchars[]; extern const char rightleftchars[];
extern const char hidespinchars[];
extern NEARDATA long yn_number; extern NEARDATA long yn_number;
extern struct restore_info restoreinfo; extern struct restore_info restoreinfo;
extern NEARDATA struct savefile_info sfcap, sfrestinfo, sfsaveinfo; extern NEARDATA struct savefile_info sfcap, sfrestinfo, sfsaveinfo;
src/cmd.c
+6 -3
View File
@@ -878,7 +878,7 @@ domonability(void)
char c = '\0'; char c = '\0';
if (might_hide && webmaker(uptr)) { if (might_hide && webmaker(uptr)) {
c = yn_function("Hide [h] or spin a web [s]?", "hsq", 'q', TRUE); c = yn_function("Hide [h] or spin a web [s]?", hidespinchars, 'q', TRUE);
if (c == 'q' || c == '\033') if (c == 'q' || c == '\033')
return ECMD_OK; return ECMD_OK;
} }
@@ -5017,7 +5017,7 @@ yn_menuable_resp(const char *resp)
{ {
return iflags.query_menu && iflags.window_inited return iflags.query_menu && iflags.window_inited
&& (resp == ynchars || resp == ynqchars || resp == ynaqchars && (resp == ynchars || resp == ynqchars || resp == ynaqchars
|| resp == rightleftchars); || resp == rightleftchars || resp == hidespinchars);
} }
staticfn void staticfn void
@@ -5054,13 +5054,16 @@ yn_function_menu(
if (resp == rightleftchars) { if (resp == rightleftchars) {
yn_func_menu_opt(win, 'r', "Right", def); yn_func_menu_opt(win, 'r', "Right", def);
yn_func_menu_opt(win, 'l', "Left", def); yn_func_menu_opt(win, 'l', "Left", def);
} else if (resp == hidespinchars) {
yn_func_menu_opt(win, 'h', "Hide", def);
yn_func_menu_opt(win, 's', "Spin a web", def);
} else { } else {
yn_func_menu_opt(win, 'y', "Yes", def); yn_func_menu_opt(win, 'y', "Yes", def);
yn_func_menu_opt(win, 'n', "No", def); yn_func_menu_opt(win, 'n', "No", def);
} }
if (resp == ynaqchars) if (resp == ynaqchars)
yn_func_menu_opt(win, 'a', "All", def); yn_func_menu_opt(win, 'a', "All", def);
if (resp == ynqchars || resp == ynaqchars) if (resp == ynqchars || resp == ynaqchars || resp == hidespinchars)
yn_func_menu_opt(win, 'q', "Quit", def); yn_func_menu_opt(win, 'q', "Quit", def);
end_menu(win, query); end_menu(win, query);
n = select_menu(win, PICK_ONE, &sel); n = select_menu(win, PICK_ONE, &sel);
src/decl.c
+1
View File
@@ -139,6 +139,7 @@ const char ynqchars[] = "ynq";
const char ynaqchars[] = "ynaq"; const char ynaqchars[] = "ynaq";
const char ynNaqchars[] = "yn#aq"; const char ynNaqchars[] = "yn#aq";
const char rightleftchars[] = "rl"; const char rightleftchars[] = "rl";
const char hidespinchars[] = "hsq";
NEARDATA long yn_number = 0L; NEARDATA long yn_number = 0L;
#ifdef PANICTRACE #ifdef PANICTRACE