augment paying shk via menu

Allow 'm p' to pay via menu when menustyle is traditional and to pay
via the old sequence when it's combination, full, or partial.  Also
revise the "Itemized billing?" prompt to accept 'm' as well as 'ynq'.
Answering 'm' will switch from the old sequence to the menu (whether
you got to that prompt via m-less 'p' for traditional or 'm p' for
other styles).

src/cmd.c

@@ -1,4 +1,4 @@
-/* NetHack 3.7	cmd.c	$NHDT-Date: 1684791777 2023/05/22 21:42:57 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.677 $ */
+/* NetHack 3.7	cmd.c	$NHDT-Date: 1702123758 2023/12/09 12:09:18 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.694 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /*-Copyright (c) Robert Patrick Rankin, 2013. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -2645,7 +2645,7 @@ struct ext_func_tab extcmdlist[] = {
     { '\0',   "panic", "test panic routine (fatal to game)",
               wiz_panic, IFBURIED | AUTOCOMPLETE | WIZMODECMD, NULL },
     { 'p',    "pay", "pay your shopping bill",
-              dopay, 0, NULL },
+              dopay, CMD_M_PREFIX, NULL },
     { '|',    "perminv", "scroll persistent inventory display",
               doperminv, IFBURIED | GENERALCMD | NOFUZZERCMD, NULL },
     { ',',    "pickup", "pick up things at the current location",

src/shk.c

@@ -1412,7 +1412,7 @@ menu_pick_pay_items(struct monst *shkp)
                making the partly-used-up code more complicated */
             if (bp->useup)
                 otmp->quan = bp->bquan;
-            Sprintf(buf, "%s%s",
+            Snprintf(buf, sizeof buf, "%s%s",
                     bp->useup ? "(used up) " : "",
                     doname(otmp));
             any.a_int = n + 1; /* +1: avoid 0 */
@@ -1421,7 +1421,7 @@ menu_pick_pay_items(struct monst *shkp)
         }
     }
 
-    end_menu(win, "Pay which items?");
+    end_menu(win, "Pay for which items?");
     n = select_menu(win, PICK_ANY, &pick_list);
     destroy_nhwindow(win);
 
@@ -1442,7 +1442,7 @@ dopay(void)
     struct monst *nxtm, *resident;
     long ltmp;
     long umoney;
-    int pass, tmp, sk = 0, seensk = 0, nexttosk = 0;
+    int pass, tmp, sk = 0, seensk = 0;
     boolean paid = FALSE, stashed_gold = (hidden_gold(TRUE) > 0L);
 
     gm.multi = 0;
@@ -1454,21 +1454,16 @@ dopay(void)
     for (shkp = next_shkp(fmon, FALSE); shkp;
          shkp = next_shkp(shkp->nmon, FALSE)) {
         sk++;
-        if (next2u(shkp->mx, shkp->my)) {
+        if (ANGRY(shkp) && next2u(shkp->mx, shkp->my))
-            /* next to an irate shopkeeper? prioritize that */
-            if (nxtm && ANGRY(nxtm))
-                continue;
-            nexttosk++;
             nxtm = shkp;
-        }
         if (canspotmon(shkp))
             seensk++;
         if (inhishop(shkp) && (*u.ushops == ESHK(shkp)->shoproom))
             resident = shkp;
     }
 
-    if (nxtm && nexttosk == 1) {
+    if (nxtm) {      /* Player should always appease an */
-        shkp = nxtm;
+        shkp = nxtm; /* irate shk standing next to them. */
         goto proceed;
     }
 
@@ -1691,7 +1686,7 @@ dopay(void)
     /* now check items on bill */
     if (eshkp->billct) {
         register boolean itemize;
-        boolean queuedpay = FALSE;
+        boolean queuedpay = FALSE, via_menu;
         int iprompt;
 
         umoney = money_cnt(gi.invent);
@@ -1708,19 +1703,35 @@ dopay(void)
             return ECMD_OK;
         }
 
-        if (flags.menu_style != MENU_TRADITIONAL && eshkp->billct > 1) {
+        via_menu = (flags.menu_style != MENU_TRADITIONAL);
-            if (!menu_pick_pay_items(shkp))
+        /* allow 'm p' to request a menu for menustyle:traditional;
-                return ECMD_OK;
+           for other styles, it will do the opposite; that doesn't make
-            queuedpay = TRUE;
+           a whole lot of sense for a 'request-menu' prefix, but otherwise
-            itemize = FALSE;
+           it would simply be reduncant and there wouldn't be any way to
-        } else {
+           skip the menu when hero owes for multiple items */
-            /* this isn't quite right; it itemizes without asking if the
+        if (iflags.menu_requested)
-             * single item on the bill is partly used up and partly unpaid */
+            via_menu = !via_menu;
-            iprompt = (eshkp->billct > 1 ? ynq("Itemized billing?") : 'y');
+        /* this will loop for a second iteration iff not initially using a
-            itemize = (iprompt == 'y');
+           menu and player answers 'm' to custom ynq prompt */
-            if (iprompt == 'q')
+        do {
-                goto thanks;
+            if (via_menu && eshkp->billct > 1) {
-        }
+                if (!menu_pick_pay_items(shkp))
+                    return ECMD_OK;
+                queuedpay = TRUE;
+                itemize = FALSE;
+                via_menu = FALSE; /* reset so that we don't loop */
+            } else {
+                /* this isn't quite right; it itemizes without asking if the
+                   single item on bill is partly used up and partly unpaid */
+                iprompt = (eshkp->billct < 2) ? 'y'
+                          : yn_function("Itemized billing?",
+                                        "ynq m", 'q', TRUE);
+                itemize = (iprompt == 'y');
+                if (iprompt == 'q')
+                    goto thanks;
+                via_menu = (iprompt == 'm');
+            }
+        } while (via_menu);
 
         for (pass = 0; pass <= 1; pass++) {
             tmp = 0;