nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

menustyle:full's 'A' choice

Browse Source 
Change how menu choice 'A' (auto-select everything) works.  It will
now auto-select all things that match any other choices (object
class(es) or BUCX state(s) or possibly unpaid status).  So it still
skips the second menu of specific objects.  And it still picks all
objects when it is the only choice or if player uses '.' to select
it along with all the rest of the first menu's possibilities.

This change won't help anyone who picks 'A' without really meaning
to.  (Maybe add a paranoid_confirm setting to for full-menu-A?)

Affects container apply/#loot and Drop-multiple.  The invent.c part
is just formatting.
This commit is contained in:
PatR
2021-04-02 12:26:41 -07:00
parent a86ebb943a
commit b65c93cdff
4 changed files with 64 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/pickup.c
View File

@@ -1143,7 +1143,7 @@ query_category(const char *qstr, /* query string */
itemflags = MENU_ITEMFLAGS_SKIPINVERT;
add_menu(win, &nul_glyphinfo, &any, invlet, 0, ATR_NONE,
(qflags & WORN_TYPES) ? "Auto-select every item being worn"
: "Auto-select every item",
: "Auto-select every relevant item",
itemflags);
any = cg.zeroany;
@@ -2899,7 +2899,7 @@ static int
menu_loot(int retry, boolean put_in)
{
int n, i, n_looted = 0;
boolean all_categories = TRUE, loot_everything = FALSE;
boolean all_categories = TRUE, loot_everything = FALSE, autopick = FALSE;
char buf[BUFSZ];
const char *action = put_in ? "Put in" : "Take out";
struct obj *otmp, *otmp2;
@@ -2918,30 +2918,41 @@ menu_loot(int retry, boolean put_in)
if (!n)
return 0;
for (i = 0; i < n; i++) {
if (pick_list[i].item.a_int == 'A')
loot_everything = TRUE;
else if (pick_list[i].item.a_int == ALL_TYPES_SELECTED)
if (pick_list[i].item.a_int == 'A') {
loot_everything = autopick = TRUE;
} else if (pick_list[i].item.a_int == ALL_TYPES_SELECTED) {
all_categories = TRUE;
else
} else {
add_valid_menu_class(pick_list[i].item.a_int);
loot_everything = FALSE;
}
}
free((genericptr_t) pick_list);
}
if (loot_everything) {
if (autopick) {
int (*inout_func)(struct obj *); /* in_container or out_container */
struct obj *firstobj;
if (!put_in) {
g.current_container->cknown = 1;
for (otmp = g.current_container->cobj; otmp; otmp = otmp2) {
otmp2 = otmp->nobj;
res = out_container(otmp);
if (res < 0)
break;
n_looted += res;
}
inout_func = out_container;
firstobj = g.current_container->cobj;
} else {
for (otmp = g.invent; otmp && g.current_container; otmp = otmp2) {
otmp2 = otmp->nobj;
res = in_container(otmp);
inout_func = in_container;
firstobj = g.invent;
}
/*
* Note: for put_in, current_container might be destroyed during
* mid-traversal by a magic bag explosion.
* Note too: items are processed in internal list order rather
* than menu display order ('sortpack') or 'sortloot' order;
* for put_in that should be item->invlet order so reasonable.
*/
for (otmp = firstobj; otmp && g.current_container; otmp = otmp2) {
otmp2 = otmp->nobj;
if (loot_everything || all_categories || allow_category(otmp)) {
res = (*inout_func)(otmp);
if (res < 0)
break;
n_looted += res;