pull request #1141 - refine washing hands

Pull request from entrez:  when dipping gloved hands into pools or
fountains to wash them, subject those gloves to water damage.  Also,
showing '-' as a likely candidate when picking an inventory item to
dip while at a pool or fountain location didn't work if player had
the 'force_invmenu' option set.

Closes #1141

src/fountain.c

@@ -551,18 +551,20 @@ wash_hands(void)
 {
     const char *hands = makeplural(body_part(HAND));
     int res = ER_NOTHING;
+    boolean was_glib = !!Glib;
 
     You("wash your %s%s in the %s.", uarmg ? "gloved " : "", hands,
         hliquid("water"));
     if (Glib) {
         make_glib(0);
         Your("%s are no longer slippery.", fingers_or_gloves(TRUE));
-        /* not what ER_GREASED is for, but the checks in dipfountain just
-           compare the result to ER_DESTROYED and ER_NOTHING, so it works */
-        res = ER_GREASED;
-    } else if (uarmg) {
-        res = water_damage(uarmg, (const char *) 0, TRUE);
     }
+    if (uarmg)
+        res = water_damage(uarmg, (const char *) 0, TRUE);
+    /* not what ER_GREASED is for, but the checks in dipfountain just
+       compare the result to ER_DESTROYED and ER_NOTHING, so it works */
+    if (was_glib && res == ER_NOTHING)
+        res = ER_GREASED;
     return res;
 }
 

src/invent.c

@@ -30,7 +30,7 @@ static int ckunpaid(struct obj *);
 static char *safeq_xprname(struct obj *);
 static char *safeq_shortxprname(struct obj *);
 static char display_pickinv(const char *, const char *, const char *,
-                            boolean, long *);
+                            boolean, boolean, long *);
 static char display_used_invlets(char);
 static boolean this_type_only(struct obj *);
 static void dounpaid(int, int, int);
@@ -1897,26 +1897,31 @@ getobj(
             long ctmp = 0;
             char menuquery[QBUFSZ];
 
+            if (ilet == '?' && !*lets && *altlets)
+                allowed_choices = altlets;
+
             menuquery[0] = qbuf[0] = '\0';
             if (iflags.force_invmenu)
                 Sprintf(menuquery, "What do you want to %s?", word);
-            if (!strcmp(word, "grease"))
+            if (!allowed_choices || *allowed_choices == '-' || *buf == '-') {
-                Sprintf(qbuf, "your %s", fingers_or_gloves(FALSE));
+                if (!strcmp(word, "grease")) {
-            else if (!strcmp(word, "write with"))
+                    Sprintf(qbuf, "your %s", fingers_or_gloves(FALSE));
-                Sprintf(qbuf, "your %s", body_part(FINGERTIP));
+                } else if (!strcmp(word, "write with")) {
-            else if (!strcmp(word, "wield"))
+                    Sprintf(qbuf, "your %s", body_part(FINGERTIP));
-                Sprintf(qbuf, "your %s %s%s", uarmg ? "gloved" : "bare",
+                } else if (!strcmp(word, "wield")) {
-                        makeplural(body_part(HAND)),
+                    Sprintf(qbuf, "your %s %s%s", uarmg ? "gloved" : "bare",
-                        !uwep ? " (wielded)" : "");
+                            makeplural(body_part(HAND)),
-            else if (!strcmp(word, "ready"))
+                            !uwep ? " (wielded)" : "");
-                Sprintf(qbuf, "empty quiver%s",
+                } else if (!strcmp(word, "ready")) {
-                        !uquiver ? " (nothing readied)" : "");
+                    Sprintf(qbuf, "empty quiver%s",
-
+                            !uquiver ? " (nothing readied)" : "");
-            if (ilet == '?' && !*lets && *altlets)
+                } else {
-                allowed_choices = altlets;
+                    Sprintf(qbuf, "your %s", makeplural(body_part(HAND)));
+                }
+            }
             ilet = display_pickinv(allowed_choices, *qbuf ? qbuf : (char *) 0,
-                                   menuquery,
+                                   menuquery, allownone, TRUE,
-                                   TRUE, allowcnt ? &ctmp : (long *) 0);
+                                   allowcnt ? &ctmp : (long *) 0);
             if (!ilet) {
                 if (oneloop)
                     return (struct obj *) 0;
@@ -3495,6 +3500,7 @@ display_pickinv(
     const char *lets,        /* non-compacted list of invlet values */
     const char *xtra_choice, /* non-object "bare hands" or "fingers" */
     const char *query,       /* optional; prompt string for menu */
+    boolean allowxtra,       /* hands are allowed (maybe alternate) choice */
     boolean want_reply,      /* True: select an item, False: just display */
     long *out_cnt) /* optional; count player entered when selecting an item */
 {
@@ -3517,7 +3523,8 @@ display_pickinv(
     boolean wizid = (wizard && iflags.override_ID), gotsomething = FALSE;
     int clr = NO_COLOR, menu_behavior = MENU_BEHAVE_STANDARD;
     boolean show_gold = TRUE, inuse_only = FALSE, skipped_gold = FALSE,
-            doing_perm_invent = FALSE, save_flags_sortpack = flags.sortpack;
+            doing_perm_invent = FALSE, save_flags_sortpack = flags.sortpack,
+            usextra = (xtra_choice && allowxtra);
 
     if (lets && !*lets)
         lets = 0; /* simplify tests: (lets) instead of (lets && *lets) */
@@ -3527,7 +3534,7 @@ display_pickinv(
         win = 0; /* passed to dump_putstr() which ignores it... */
     } else
 #endif
-    if (lets || xtra_choice || wizid || want_reply
+    if (lets || usextra || wizid || want_reply
 #ifdef TTY_PERM_INVENT
         /*|| !gi.in_sync_perminvent*/
 #endif
@@ -3570,7 +3577,7 @@ display_pickinv(
        for !lets (full invent or inuse_only) and for override_ID (wizard
        mode identify), skip message_menu handling of single item even if
        item count was 1 */
-    if (xtra_choice || (n == 1 && (!lets || wizid)))
+    if (usextra || (n == 1 && (!lets || wizid)))
         ++n;
 
     if (n == 0) {
@@ -3587,9 +3594,10 @@ display_pickinv(
            we actually use a fake message-line menu in order to allow
            the user to perform selection at the --More-- prompt for tty */
         ret = '\0';
-        if (xtra_choice) {
+        if (usextra) {
             /* xtra_choice is "bare hands" (wield), "fingertip" (Engrave),
-               "nothing" (ready Quiver), or "fingers" (apply grease) */
+               "nothing" (prepare Quiver), "fingers" (apply grease), or
+               "hands" (default) */
             ret = message_menu(HANDS_SYM, PICK_ONE,
                                xprname((struct obj *) 0, xtra_choice,
                                        HANDS_SYM, TRUE, 0L, 0L)); /* '-' */
@@ -3685,7 +3693,7 @@ display_pickinv(
                      ATR_NONE, clr, prompt, MENU_ITEMFLAGS_SKIPINVERT);
             gotsomething = TRUE;
         }
-   } else if (xtra_choice) {
+   } else if (usextra) {
         /* wizard override ID and xtra_choice are mutually exclusive */
         if (flags.sortpack)
             add_menu_heading(win, "Miscellaneous");
@@ -3782,7 +3790,8 @@ display_pickinv(
        includes everything; won't work via keyboard if current menu
        uses '*' as group accelerator for gems but might work via mouse */
     if (iflags.force_invmenu && lets && want_reply
-        && (int) strlen(lets) < inv_cnt(TRUE)) {
+        && ((allowxtra && !usextra)
+            || (int) strlen(lets) < inv_cnt(TRUE))) {
         any = cg.zeroany;
         add_menu_heading(win, "Special");
         any.a_char = '*';
@@ -3874,7 +3883,7 @@ display_inventory(const char *lets, boolean want_reply)
         return '\0';
     }
     return display_pickinv(lets, (char *) 0, (char *) 0,
-                           want_reply, (long *) 0);
+                           FALSE, want_reply, (long *) 0);
 }
 
 /*