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

Show correct keybind in ext cmd list

Browse Source
This commit is contained in:
Pasi Kallinen
2016-10-11 23:03:36 +03:00
parent 23157c4830
commit 9858e46f64
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cmd.c
+10 -4
View File
@@ -329,8 +329,9 @@ doextcmd(VOID_ARGS)
return 0; return 0;
} }
if (iflags.menu_requested && !accept_menu_prefix(func)) { if (iflags.menu_requested && !accept_menu_prefix(func)) {
pline("'%s' prefix has no effect for this command.", pline("'%s' prefix has no effect for the %s command.",
visctrl(Cmd.spkeys[NHKF_REQMENU])); visctrl(Cmd.spkeys[NHKF_REQMENU]),
extcmdlist[idx].ef_txt);
iflags.menu_requested = FALSE; iflags.menu_requested = FALSE;
} }
retval = (*func)(); retval = (*func)();
@@ -346,13 +347,18 @@ doextlist(VOID_ARGS)
register const struct ext_func_tab *efp; register const struct ext_func_tab *efp;
char buf[BUFSZ]; char buf[BUFSZ];
winid datawin; winid datawin;
char ch = cmd_from_func(doextcmd);
datawin = create_nhwindow(NHW_TEXT); datawin = create_nhwindow(NHW_TEXT);
putstr(datawin, 0, ""); putstr(datawin, 0, "");
putstr(datawin, 0, " Extended Commands List"); putstr(datawin, 0, " Extended Commands List");
putstr(datawin, 0, ""); putstr(datawin, 0, "");
putstr(datawin, 0, " Press '#', then type:"); if (ch) {
putstr(datawin, 0, ""); Sprintf(buf, " Press '%s', then type:",
visctrl(ch));
putstr(datawin, 0, buf);
putstr(datawin, 0, "");
}
for (efp = extcmdlist; efp->ef_txt; efp++) { for (efp = extcmdlist; efp->ef_txt; efp++) {
if (!wizard && (efp->flags & WIZMODECMD)) if (!wizard && (efp->flags & WIZMODECMD))