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

Make #tip at a location which has multiple containers honor menustyle

Browse Source 
rather than always use a menu.  Only affects menustyle:traditional and
can be overridden at the time by using the 'm' prefix before the #tip
command.

When using the menu, add an explicit pick-from-inventory choice.  The
behavior there stays the same:  ask about inventory if no floor container
is chosen.
This commit is contained in:
PatR
2015-06-16 19:23:43 -07:00
parent 5dc0a5747a
commit da1ae4a7da
2 changed files with 39 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/cmd.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 cmd.c $NHDT-Date: 1434071945 2015/06/12 01:19:05 $ $NHDT-Branch: master $:$NHDT-Revision: 1.195 $ */
/* NetHack 3.6 cmd.c $NHDT-Date: 1434507810 2015/06/17 02:23:30 $ $NHDT-Branch: master $:$NHDT-Revision: 1.196 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -3201,7 +3201,8 @@ STATIC_OVL boolean
accept_menu_prefix(cmd_func)
int NDECL((*cmd_func));
{
if (cmd_func == dopickup || cmd_func == doextcmd || cmd_func == doextlist)
if (cmd_func == dopickup || cmd_func == dotip
|| cmd_func == doextcmd || cmd_func == doextlist)
return TRUE;
return FALSE;
}