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

Show keys in travel help wrapped in single quotes

Browse Source
This commit is contained in:
Pasi Kallinen
2016-09-21 19:25:25 +03:00
parent 18f6ab00e8
commit ce315311f5
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/do_name.c
+18 -18
View File
@@ -54,28 +54,28 @@ const char *goal;
boolean doing_what_is; boolean doing_what_is;
winid tmpwin = create_nhwindow(NHW_MENU); winid tmpwin = create_nhwindow(NHW_MENU);
Sprintf(sbuf, "Use [%c%c%c%c] to move the cursor to %s.", /* hjkl */ Sprintf(sbuf, "Use '%c', '%c', '%c', '%c' to move the cursor to %s.", /* hjkl */
Cmd.move_W, Cmd.move_S, Cmd.move_N, Cmd.move_E, goal); Cmd.move_W, Cmd.move_S, Cmd.move_N, Cmd.move_E, goal);
putstr(tmpwin, 0, sbuf); putstr(tmpwin, 0, sbuf);
putstr(tmpwin, 0, "Use [HJKL] to move the cursor 8 units at a time."); putstr(tmpwin, 0, "Use 'H', 'J', 'K', 'L' to move the cursor 8 units at a time.");
putstr(tmpwin, 0, "Or enter a background symbol (ex. <)."); putstr(tmpwin, 0, "Or enter a background symbol (ex. '<').");
putstr(tmpwin, 0, "Use @ to move the cursor on yourself."); putstr(tmpwin, 0, "Use '@' to move the cursor on yourself.");
if (!iflags.terrainmode || (iflags.terrainmode & TER_MON) != 0) if (!iflags.terrainmode || (iflags.terrainmode & TER_MON) != 0)
putstr(tmpwin, 0, "Use m or M to move the cursor to next monster."); putstr(tmpwin, 0, "Use 'm' or 'M' to move the cursor to next monster.");
if (!iflags.terrainmode || (iflags.terrainmode & TER_OBJ) != 0) if (!iflags.terrainmode || (iflags.terrainmode & TER_OBJ) != 0)
putstr(tmpwin, 0, "Use o or O to move the cursor to next object."); putstr(tmpwin, 0, "Use 'o' or 'O' to move the cursor to next object.");
if (!iflags.terrainmode || (iflags.terrainmode & TER_MAP) != 0) { if (!iflags.terrainmode || (iflags.terrainmode & TER_MAP) != 0) {
/* both of these are primarily useful when choosing a travel /* both of these are primarily useful when choosing a travel
destination for the '_' command */ destination for the '_' command */
putstr(tmpwin, 0, putstr(tmpwin, 0,
"Use d or D to move the cursor to next door or doorway."); "Use 'd' or 'D' to move the cursor to next door or doorway.");
putstr(tmpwin, 0, putstr(tmpwin, 0,
"Use x or X to move the cursor to unexplored location."); "Use 'x' or 'X' to move the cursor to unexplored location.");
} }
if (!iflags.terrainmode) { if (!iflags.terrainmode) {
if (getpos_hilitefunc) if (getpos_hilitefunc)
putstr(tmpwin, 0, "Use $ to display valid locations."); putstr(tmpwin, 0, "Use '$' to display valid locations.");
putstr(tmpwin, 0, "Use # to toggle automatic description."); putstr(tmpwin, 0, "Use '#' to toggle automatic description.");
if (iflags.cmdassist) /* assisting the '/' command, I suppose... */ if (iflags.cmdassist) /* assisting the '/' command, I suppose... */
putstr(tmpwin, 0, putstr(tmpwin, 0,
(iflags.getpos_coords == GPCOORDS_NONE) (iflags.getpos_coords == GPCOORDS_NONE)
@@ -84,20 +84,20 @@ const char *goal;
/* disgusting hack; the alternate selection characters work for any /* disgusting hack; the alternate selection characters work for any
getpos call, but only matter for dowhatis (and doquickwhatis) */ getpos call, but only matter for dowhatis (and doquickwhatis) */
doing_what_is = (goal == what_is_an_unknown_object); doing_what_is = (goal == what_is_an_unknown_object);
Sprintf(sbuf, "Type a .%s when you are at the right place.", Sprintf(sbuf, "Type a '.'%s when you are at the right place.",
doing_what_is ? " or , or ; or :" : ""); doing_what_is ? " or ',' or ';' or ':'" : "");
putstr(tmpwin, 0, sbuf); putstr(tmpwin, 0, sbuf);
if (doing_what_is) { if (doing_what_is) {
putstr(tmpwin, 0, putstr(tmpwin, 0,
" : describe current spot, show 'more info', move to another spot."); " ':' describe current spot, show 'more info', move to another spot.");
Sprintf(sbuf, Sprintf(sbuf,
" . describe current spot,%s move to another spot;", " '.' describe current spot,%s move to another spot;",
flags.help ? " prompt if 'more info'," : ""); flags.help ? " prompt if 'more info'," : "");
putstr(tmpwin, 0, sbuf); putstr(tmpwin, 0, sbuf);
putstr(tmpwin, 0, putstr(tmpwin, 0,
" , describe current spot, move to another spot;"); " ',' describe current spot, move to another spot;");
putstr(tmpwin, 0, putstr(tmpwin, 0,
" ; describe current spot, stop looking at things;"); " ';' describe current spot, stop looking at things;");
} }
} }
if (!force) if (!force)
@@ -353,7 +353,7 @@ const char *goal;
if (!goal) if (!goal)
goal = "desired location"; goal = "desired location";
if (flags.verbose) { if (flags.verbose) {
pline("(For instructions type a ?)"); pline("(For instructions type a '?')");
msg_given = TRUE; msg_given = TRUE;
} }
cx = ccp->x; cx = ccp->x;
@@ -568,7 +568,7 @@ const char *goal;
if (!force) if (!force)
Strcpy(note, "aborted"); Strcpy(note, "aborted");
else else
Sprintf(note, "use %c%c%c%c or .", /* hjkl */ Sprintf(note, "use '%c', '%c', '%c', '%c' or '.'", /* hjkl */
Cmd.move_W, Cmd.move_S, Cmd.move_N, Cmd.move_W, Cmd.move_S, Cmd.move_N,
Cmd.move_E); Cmd.move_E);
pline("Unknown direction: '%s' (%s).", visctrl((char) c), pline("Unknown direction: '%s' (%s).", visctrl((char) c),