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

travel targetting via keyboard

Browse Source 
Some phrase substitution in getpos() or its helpers produced
``Pick a target interesting thing in view for travel''
for 'm _', which sounds pretty awkward.  Change that to be
``Pick an interesting thing in view for travel destination''
leaving "target" implied.

For plain '_', typing '!' yielded
``Using a menu to show possible targets.''
but then nothing happened.  Change that to be
``Using a menu to show possible targets for 'm|M', 'o|O', 'd|D',
and 'x|X'.''
to explain when a menu will actually appear.
This commit is contained in:
PatR
2019-01-08 14:42:54 -08:00
parent dedd0dd30a
commit d4e3f9d9d3
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/do_name.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 do_name.c $NHDT-Date: 1543185069 2018/11/25 22:31:09 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.136 $ */ /* NetHack 3.6 do_name.c $NHDT-Date: 1546987367 2019/01/08 22:42:47 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.140 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Pasi Kallinen, 2018. */ /*-Copyright (c) Pasi Kallinen, 2018. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -608,10 +608,10 @@ int gloc;
} }
} }
Sprintf(tmpbuf, "Pick a target %s%s%s", Sprintf(tmpbuf, "Pick %s%s%s",
gloc_descr[gloc][1], an(gloc_descr[gloc][1]),
gloc_filtertxt[iflags.getloc_filter], gloc_filtertxt[iflags.getloc_filter],
iflags.getloc_travelmode ? " for travel" : ""); iflags.getloc_travelmode ? " for travel destination" : "");
end_menu(tmpwin, tmpbuf); end_menu(tmpwin, tmpbuf);
pick_cnt = select_menu(tmpwin, PICK_ONE, &picks); pick_cnt = select_menu(tmpwin, PICK_ONE, &picks);
destroy_nhwindow(tmpwin); destroy_nhwindow(tmpwin);
@@ -631,7 +631,7 @@ boolean force;
const char *goal; const char *goal;
{ {
const char *cp; const char *cp;
struct { static struct {
int nhkf, ret; int nhkf, ret;
} const pick_chars_def[] = { } const pick_chars_def[] = {
{ NHKF_GETPOS_PICK, LOOK_TRADITIONAL }, { NHKF_GETPOS_PICK, LOOK_TRADITIONAL },
@@ -639,7 +639,7 @@ const char *goal;
{ NHKF_GETPOS_PICK_O, LOOK_ONCE }, { NHKF_GETPOS_PICK_O, LOOK_ONCE },
{ NHKF_GETPOS_PICK_V, LOOK_VERBOSE } { NHKF_GETPOS_PICK_V, LOOK_VERBOSE }
}; };
const int mMoOdDxX_def[] = { static const int mMoOdDxX_def[] = {
NHKF_GETPOS_MON_NEXT, NHKF_GETPOS_MON_NEXT,
NHKF_GETPOS_MON_PREV, NHKF_GETPOS_MON_PREV,
NHKF_GETPOS_OBJ_NEXT, NHKF_GETPOS_OBJ_NEXT,
@@ -810,8 +810,8 @@ const char *goal;
} else if (c == Cmd.spkeys[NHKF_GETPOS_LIMITVIEW]) { } else if (c == Cmd.spkeys[NHKF_GETPOS_LIMITVIEW]) {
static const char *const view_filters[NUM_GFILTER] = { static const char *const view_filters[NUM_GFILTER] = {
"Not limiting targets", "Not limiting targets",
"Limiting targets to in sight", "Limiting targets to those in sight",
"Limiting targets to in same area" "Limiting targets to those in same area"
}; };
iflags.getloc_filter = (iflags.getloc_filter + 1) % NUM_GFILTER; iflags.getloc_filter = (iflags.getloc_filter + 1) % NUM_GFILTER;
@@ -827,8 +827,10 @@ const char *goal;
goto nxtc; goto nxtc;
} else if (c == Cmd.spkeys[NHKF_GETPOS_MENU]) { } else if (c == Cmd.spkeys[NHKF_GETPOS_MENU]) {
iflags.getloc_usemenu = !iflags.getloc_usemenu; iflags.getloc_usemenu = !iflags.getloc_usemenu;
pline("%s a menu to show possible targets.", pline("%s a menu to show possible targets%s.",
iflags.getloc_usemenu ? "Using" : "Not using"); iflags.getloc_usemenu ? "Using" : "Not using",
iflags.getloc_usemenu
? " for 'm|M', 'o|O', 'd|D', and 'x|X'" : "");
msg_given = TRUE; msg_given = TRUE;
goto nxtc; goto nxtc;
} else if (c == Cmd.spkeys[NHKF_GETPOS_SELF]) { } else if (c == Cmd.spkeys[NHKF_GETPOS_SELF]) {