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

Generalize cmdassist direction help

Browse Source 
to work with any call to getdir().
When cmdassist is set, instead of the
message:
"What a strange direction!"
you get a screen of help showing the valid direction keys.

!cmdassist will suppress the extra help information.
This commit is contained in:
nethack.allison
2002-08-04 22:14:02 +00:00
parent 8631cba725
commit 4fd1cc98a9
1 changed files with 45 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cmd.c
+45 -19
View File
@@ -148,7 +148,7 @@ static void NDECL(end_of_input);
static const char* readchar_queue=""; static const char* readchar_queue="";
STATIC_DCL char *NDECL(parse); STATIC_DCL char *NDECL(parse);
STATIC_DCL boolean FDECL(help_control, (CHAR_P, char *)); STATIC_DCL boolean FDECL(help_dir, (CHAR_P, char *));
#ifdef OVL1 #ifdef OVL1
@@ -1908,11 +1908,13 @@ const char *s;
if(dirsym == '.' || dirsym == 's') if(dirsym == '.' || dirsym == 's')
u.dx = u.dy = u.dz = 0; u.dx = u.dy = u.dz = 0;
else if(!movecmd(dirsym) && !u.dz) { else if(!movecmd(dirsym) && !u.dz) {
boolean did_control = FALSE; boolean did_help = FALSE;
if(!index(quitchars, dirsym)) { if(!index(quitchars, dirsym)) {
if (s && *s == '^' && iflags.cmdassist) if (iflags.cmdassist) {
did_control = help_control(dirsym, "Invalid direction key!"); did_help = help_dir((s && *s == '^') ? dirsym : 0,
if (!did_control) pline("What a strange direction!"); "Invalid direction key!");
}
if (!did_help) pline("What a strange direction!");
} }
return 0; return 0;
} }
@@ -1921,24 +1923,33 @@ const char *s;
} }
STATIC_OVL boolean STATIC_OVL boolean
help_control(sym, msg) help_dir(sym, msg)
char sym; char sym;
char *msg; char *msg;
{ {
char ctrl; char ctrl;
winid win; winid win;
char *wiz_only_list = "EFGIOVW";
char buf[BUFSZ], buf2[BUFSZ], *expl; char buf[BUFSZ], buf2[BUFSZ], *expl;
win = create_nhwindow(NHW_TEXT);
if (!win) return FALSE;
if (msg) {
Sprintf(buf, "cmdassist: %s", msg);
putstr(win, 0, buf);
putstr(win, 0, "");
}
if (letter(sym)) { if (letter(sym)) {
sym = highc(sym); sym = highc(sym);
ctrl = (sym - 'A') + 1; ctrl = (sym - 'A') + 1;
if ((expl = dowhatdoes_core(ctrl, buf2))) { if ((expl = dowhatdoes_core(ctrl, buf2))
win = create_nhwindow(NHW_TEXT); && (!index(wiz_only_list, sym)
putstr(win, 0, "cmdassist"); #ifdef WIZARD
if (msg) putstr(win, 0, msg); || wizard)
putstr(win, 0, ""); #endif
Sprintf(buf, ) {
"Are you trying to use ^%c as specified in the Guidebook?", Sprintf(buf, "Are you trying to use ^%c%s?", sym,
sym); index(wiz_only_list, sym) ? "" :
" as specified in the Guidebook");
putstr(win, 0, buf); putstr(win, 0, buf);
putstr(win, 0, ""); putstr(win, 0, "");
putstr(win, 0, expl); putstr(win, 0, expl);
@@ -1948,13 +1959,28 @@ char *msg;
"the <Ctrl> key, and the <%c> key at the same time.", sym); "the <Ctrl> key, and the <%c> key at the same time.", sym);
putstr(win, 0, buf); putstr(win, 0, buf);
putstr(win, 0, ""); putstr(win, 0, "");
putstr(win, 0, "(Suppress this message with !cmdassist in config file.)");
display_nhwindow(win, FALSE);
destroy_nhwindow(win);
return TRUE;
} }
} }
return FALSE; if (iflags.num_pad) {
putstr(win, 0, "Valid direction keys (with number_pad on) are:");
putstr(win, 0, " 7 8 9");
putstr(win, 0, " \\ | / ");
putstr(win, 0, " 4- . -6");
putstr(win, 0, " / | \\ ");
putstr(win, 0, " 1 2 3");
} else {
putstr(win, 0, "Valid direction keys are:");
putstr(win, 0, " y k u");
putstr(win, 0, " \\ | / ");
putstr(win, 0, " h- . -l");
putstr(win, 0, " / | \\ ");
putstr(win, 0, " b j n");
};
putstr(win, 0, "");
putstr(win, 0, "(Suppress this message with !cmdassist in config file.)");
display_nhwindow(win, FALSE);
destroy_nhwindow(win);
return TRUE;
} }
#endif /* OVL1 */ #endif /* OVL1 */