]> granicus.if.org Git - nethack/commitdiff
When levitating, hide drink and dip from herecmd_menu
authorPasi Kallinen <paxed@alt.org>
Thu, 7 Apr 2022 13:44:16 +0000 (16:44 +0300)
committerPasi Kallinen <paxed@alt.org>
Thu, 7 Apr 2022 13:44:16 +0000 (16:44 +0300)
src/cmd.c

index 2c272dbeadfcce449a632b3aa1c22cb1802911e9..c361fa0eb7a240a8b271fe29477184c268d28044 100644 (file)
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -4717,12 +4717,12 @@ here_cmd_menu(void)
     win = create_nhwindow(NHW_MENU);
     start_menu(win, MENU_BEHAVE_STANDARD);
 
-    if (IS_FOUNTAIN(typ) || IS_SINK(typ)) {
+    if ((IS_FOUNTAIN(typ) || IS_SINK(typ)) && can_reach_floor(FALSE)) {
         Sprintf(buf, "Drink from the %s",
                 defsyms[IS_FOUNTAIN(typ) ? S_fountain : S_sink].explanation);
         mcmd_addmenu(win, MCMD_QUAFF, buf);
     }
-    if (IS_FOUNTAIN(typ))
+    if (IS_FOUNTAIN(typ) && can_reach_floor(FALSE))
         mcmd_addmenu(win, MCMD_DIP, "Dip something into the fountain");
     if (IS_THRONE(typ))
         mcmd_addmenu(win, MCMD_SIT, "Sit on the throne");