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

eating, drinking via #herecmdmenu

Browse Source 
Fix eat floor food and drink from dungeon feature via #herecmdmenu.
That uses queued commands, but those two actions were changed to
skip the floor when queued input was present because asking about
floor items interfered with context-sensitive inventory item-actions.

I was misled by a comment that says it couldn't insert an m-prefix;
that was for treating the 'm' key as typed text rather than as a
command.  There's no problem with inserting a #reqmenu command which
is what 'm' is these days.  So item actions can force 'm' to skip the
floor and go directly to inventory, also the #eat and #quaff commands
don't have to alter their behavior when queued input is pending so
the #herecmdmenu usage for them gets fixed.
This commit is contained in:
PatR
2022-04-16 15:32:41 -07:00
parent f04f974c11
commit 52cfe40d33
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/invent.c
View File

@@ -2834,8 +2834,10 @@ itemactions(struct obj *otmp)
cmdq_add_key(otmp->invlet);
break;
case IA_DIP_OBJ:
/*cmdq_add_ec(dodip);*/
/*cmdq_add_userinput();*/
/* #altdip instead of normal #dip - takes potion to dip into
first (the inventory item instigating this) and item to
be dipped second, also ignores floor features such as
fountain/sink so we don't need to force m-prefix here */
cmdq_add_ec(dip_into);
cmdq_add_key(otmp->invlet);
break;
@@ -2844,7 +2846,9 @@ itemactions(struct obj *otmp)
cmdq_add_key(otmp->invlet);
break;
case IA_EAT_OBJ:
/* FIXME: can't add this! cmdq_add_key('m');*/ /* m-prefix: eat, skip floor obj */
/* start with m-prefix; for #eat, it means ignore floor food
if present and eat food from invent */
cmdq_add_ec(do_reqmenu);
cmdq_add_ec(doeat);
cmdq_add_key(otmp->invlet);
break;
@@ -2857,6 +2861,9 @@ itemactions(struct obj *otmp)
cmdq_add_key(otmp->invlet);
break;
case IA_QUAFF_OBJ:
/* start with m-prefix; for #quaff, it means ignore fountain
or sink if present and drink a potion from invent */
cmdq_add_ec(do_reqmenu);
cmdq_add_ec(dodrink);
cmdq_add_key(otmp->invlet);
break;