'O' help bulletproofing

When using the 'O' menu, if player picks '?' plus additional choices,
it shows help and then operates on the other choices as if normal.
But for the latter, it was re-using the '?' pick as an option to
change, attempting (and silently failing) to toggle the legacy option
because it happens to be allopts['?' - 1].  It was also relying on
the list of picks being sorted in menu order rather than in player's
selection order or some other arbitrary ordering, something not
specified by the windowing specs.

Instead of looking for '?' as the first selection, process the list
normally and show the options menu help if '?' is found as a choice.
If any interface doesn't return a set of multiple picks in menu
order, the help might not be seen before prompting for compounds,
but it would be very unusual to ask for help and also try to make
changes at the same time so this doesn't seem worth worrying about.

diff --git a/src/options.c b/src/options.c
index bdc145bd4d2886fe5bffa7be110bcba904f3988a..ab3fe31305bc7a768c867eaf4b32a69c6e85465d 100644 (file)
--- a/src/options.c
+++ b/src/options.c
@@ -7453,20 +7453,6 @@ doset(void) /* changing options via menu by Per Liboriussen */
     g.opt_need_redraw = FALSE;
     g.opt_need_glyph_reset = FALSE;
     if ((pick_cnt = select_menu(tmpwin, PICK_ANY, &pick_list)) > 0) {
-        if (pick_list[0].item.a_int - 1 == '?') {
-            /* player chose the special '?' entry */
-            display_file(OPTMENUHELP, FALSE);
-            /* if '?' was the only thing selected, go back and pick all
-               over again without it as an available choice this time;
-               however, if any other stuff was also chosen, just continue
-               on below and perform the other requested option settings */
-            if (pick_cnt == 1) {
-                free((genericptr_t) pick_list), pick_list = (menu_item *) 0;
-                destroy_nhwindow(tmpwin);
-                skiphelp = TRUE;
-                goto rerun;
-            }
-        }
         /*
          * Walk down the selection list and either invert the booleans
          * or prompt for new values. In most cases, call parseoptions()
@@ -7475,6 +7461,19 @@ doset(void) /* changing options via menu by Per Liboriussen */
          */
         for (pick_idx = 0; pick_idx < pick_cnt; ++pick_idx) {
             opt_indx = pick_list[pick_idx].item.a_int - 1;
+            if (opt_indx == '?') {
+                display_file(OPTMENUHELP, FALSE);
+                /* if '?' was only the thing selected, go back and pick all
+                   over again without it as an available choice this time */
+                if (pick_cnt == 1) {
+                    free((genericptr_t) pick_list), pick_list = 0;
+                    destroy_nhwindow(tmpwin);
+                    skiphelp = TRUE;
+                    goto rerun;
+                }
+                /* otherwise process other picks normally */
+                continue; /* just handled '?' */
+            }
             if (opt_indx < -1)
                 opt_indx++; /* -1 offset for select_menu() */
             opt_indx -= indexoffset;