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

fix buglist entry: menu upon request

Browse Source 
For "traditional" menu style, pickup and #loot/apply can't accept an 'm'
response to bring up a menu upon request when all items involved are of
the same class, because the prompt where that response is allowed only
gets issued when multiple classes are present.
This commit is contained in:
nethack.allison
2003-01-11 17:22:58 +00:00
parent a411ff7e9b
commit d1c2a37deb
7 changed files with 64 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/invent.c
View File

@@ -1136,6 +1136,7 @@ unsigned *resultflags;
int FDECL((*ckfn),(OBJ_P)) = (int FDECL((*),(OBJ_P))) 0;
boolean FDECL((*filter),(OBJ_P)) = (boolean FDECL((*),(OBJ_P))) 0;
boolean takeoff, ident, allflag, m_seen;
int itemcount;
#ifndef GOLDOBJ
int oletct, iletct, allowgold, unpaid, oc_of_sym;
#else
@@ -1172,7 +1173,7 @@ unsigned *resultflags;
#ifndef GOLDOBJ
(allowgold != 0),
#endif
filter);
filter, &itemcount);
unpaid = count_unpaid(invent);
if (ident && !iletct) {
@@ -1928,7 +1929,7 @@ dotypeinv()
char c = '\0';
int n, i = 0;
char *extra_types, types[BUFSZ];
int class_count, oclass, unpaid_count;
int class_count, oclass, unpaid_count, itemcount;
boolean billx = *u.ushops && doinvbill(0);
menu_item *pick_list;
boolean traditional = TRUE;
@@ -1963,7 +1964,7 @@ dotypeinv()
#ifndef GOLDOBJ
(u.ugold != 0),
#endif
(boolean FDECL((*),(OBJ_P))) 0);
(boolean FDECL((*),(OBJ_P))) 0, &itemcount);
if (unpaid_count) {
Strcat(types, "u");
class_count++;