Merge pull request #170 from k21971/A-changes

A changes

Author: saltwaterterrapin

dat/opthelp

@@ -3,6 +3,7 @@ Boolean options not under specific compile flags (with default values in []):
 option setting, which is reached via the 'O' command.)
 
 acoustics      can your character hear anything                   [TRUE]
+autoall_menu   show inventory menu with the 'A' key when looting  [FALSE]
 autodescribe   describe the terrain under cursor                  [FALSE]
 autodig        dig if moving and wielding digging tool            [FALSE]
 autoopen       walking into a door attempts to open it            [TRUE]

doc/Guidebook.mn

@@ -2925,6 +2925,13 @@ If you prefix the value with \(oq!\(cq or \(lqno\(rq, you will
 exclude that alignment from being picked randomly.
 Cannot be set with the \(oqO\(cq command.
 Persistent.
+.lp autoall_menu
+When selecting the 'A' option while looting a bag, show a menu of inventory
+items with everything preselected instead of immediately moving the items
+(default false).
+'A' can be combined with other filters to show a preselected
+list of all items satisfying the filters. Only matters with full menustyle.
+Persistent.
 .lp autodescribe
 Automatically describe the terrain under cursor when asked to get a location
 on the map (default true).

doc/Guidebook.tex

@@ -3217,6 +3217,13 @@ \subsection*{Customization options}
 exclude that alignment from being picked randomly.
 Cannot be set with the `{\tt O}' command.  Persistent.
 %.lp
+\item[\ib{autoall\verb+_+menu}]
+When selecting the 'A' option while looting a bag, show a menu of inventory
+items with everything preselected instead of immediately moving the items
+(default false). 'A' can be combined with other filters to show a preselected
+list of all items satisfying the filters. Only matters with full menustyle.
+Persistent.
+%.lp
 \item[\ib{autodescribe}]
 Automatically describe the terrain under cursor when asked to get a location
 on the map (default true).
@@ -3802,7 +3809,7 @@ \subsection*{Customization options}
 Likewise for the `a' (apply) command if it causes the applied item to
 become wielded.  Persistent.
 %.lp
-\item[\ib(quick\verb+_+farsight}
+\item[\ib{quick\verb+_+farsight}]
 When set, usually prevents the ``you sense your surroundings'' message
 where play pauses to allow you to browse the map whenever clairvoyance
 randomly activates.

doc/Guidebook.txt

@@ -3288,6 +3288,14 @@
             ment  from  being  picked randomly.  Cannot be set with the `O'
             command.  Persistent.
 
+          autoall_menu
+            When selecting  the 'A' option while looting a bag, show a menu
+            of inventory  items  with  everything  preselected  instead  of
+            immediately  moving  the  items  (default false).  'A'  can  be
+            combined  with other filters to show a  preselected list of all
+            items satisfying the filters. Only matters with full menustyle.
+            Persistent.
+
           autodescribe
             Automatically describe the terrain under cursor when  asked  to
             get a location on the map (default true).  The whatis_coord op-

include/flag.h

@@ -16,17 +16,18 @@
  */
 
 struct flag {
-    boolean acoustics;  /* allow dungeon sound messages */
-    boolean autodig;    /* MRKR: Automatically dig */
-    boolean autoquiver; /* Automatically fill quiver */
-    boolean autoopen;   /* open doors by walking into them */
-    boolean autounlock; /* automatically apply unlocking tools */
-    boolean beginner;   /* True early in each game; affects feedback */
-    boolean biff;      /* enable checking for mail */
-    boolean bones;     /* allow saving/loading bones */
-    boolean confirm;   /* confirm before hitting tame monsters */
-    boolean dark_room; /* show shadows in lit rooms */
-    boolean debug;     /* in debugging mode (aka wizard mode) */
+    boolean acoustics;    /* allow dungeon sound messages */
+    boolean autoall_menu; /* show menu with 'A' menu option */
+    boolean autodig;      /* MRKR: Automatically dig */
+    boolean autoquiver;   /* Automatically fill quiver */
+    boolean autoopen;     /* open doors by walking into them */
+    boolean autounlock;   /* automatically apply unlocking tools */
+    boolean beginner;     /* True early in each game; affects feedback */
+    boolean biff;         /* enable checking for mail */
+    boolean bones;        /* allow saving/loading bones */
+    boolean confirm;      /* confirm before hitting tame monsters */
+    boolean dark_room;    /* show shadows in lit rooms */
+    boolean debug;        /* in debugging mode (aka wizard mode) */
 #define wizard flags.debug
     boolean end_own; /* list all own scores */
     boolean explore; /* in exploration mode (aka discover mode) */

include/wintype.h

@@ -64,6 +64,7 @@ typedef struct mi {
 #define PICK_NONE 0 /* user picks nothing (display only) */
 #define PICK_ONE 1  /* only pick one */
 #define PICK_ANY 2  /* can pick any amount */
+#define PICK_ALL 3  /* start with every menu item autoselected */
 
 /* window types */
 /* any additional port specific types should be defined in win*.h */

src/options.c

@@ -103,6 +103,7 @@ static struct Bool_Opt {
 #else
     { "asksavedisk", (boolean *) 0, FALSE, SET_IN_FILE },
 #endif
+    { "autoall_menu", &flags.autoall_menu, FALSE, SET_IN_GAME },
     { "autodescribe", &iflags.autodescribe, TRUE, SET_IN_GAME },
     { "autodig", &flags.autodig, FALSE, SET_IN_GAME },
     { "autoopen", &flags.autoopen, TRUE, SET_IN_GAME },

src/pickup.c

@@ -943,7 +943,8 @@ boolean FDECL((*allow), (OBJ_P)); /* allow function */
                          (qflags & USE_INVLET) ? curr->invlet
                            : (first && curr->oclass == COIN_CLASS) ? '$' : 0,
                          def_oc_syms[(int) objects[curr->otyp].oc_class].sym,
-                         ATR_NONE, doname_with_price(curr), MENU_UNSELECTED);
+                         ATR_NONE, doname_with_price(curr),
+                         how == PICK_ALL ? MENU_SELECTED : MENU_UNSELECTED);
                 first = FALSE;
             }
         }
@@ -3148,7 +3149,7 @@ boolean put_in;
         free((genericptr_t) pick_list);
     }
 
-    if (loot_everything) {
+    if (!flags.autoall_menu && loot_everything) {
         if (!put_in) {
             current_container->cknown = 1;
             for (otmp = current_container->cobj; otmp; otmp = otmp2) {
@@ -3175,7 +3176,8 @@ boolean put_in;
             current_container->cknown = 1;
         Sprintf(buf, "%s what?", action);
         n = query_objlist(buf, put_in ? &invent : &(current_container->cobj),
-                          mflags, &pick_list, PICK_ANY,
+                          mflags, &pick_list, loot_everything ? PICK_ALL
+                                                              : PICK_ANY,
                           all_categories ? allow_all : allow_category);
         if (n) {
             n_looted = n;