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

BUC patch

Browse Source 
This adds the BUC-patch, except that it includes four separate choices for
blessed/cursed/uncursed/unknown.  The patch only applies to full menu styles.

--Ken A

(Incidentally, I have a suggestion: when deciding what's the first line for
purposes of mailing out messages, use the first nonblank line...)
This commit is contained in:
arromdee
2002-01-16 03:19:45 +00:00
parent 5bf430c3d3
commit 4361289ec3
6 changed files with 137 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/pickup.c
View File

@@ -716,14 +716,33 @@ int how; /* type of query */
char invlet;
int ccount;
boolean do_unpaid = FALSE;
boolean do_blessed = FALSE, do_cursed = FALSE, do_uncursed = FALSE,
do_buc_unknown = FALSE;
int num_buc_types = 0;
*pick_list = (menu_item *) 0;
if (!olist) return 0;
if ((qflags & UNPAID_TYPES) && count_unpaid(olist)) do_unpaid = TRUE;
if ((qflags & BUC_BLESSED) && count_buc(olist, BUC_BLESSED)) {
do_blessed = TRUE;
num_buc_types++;
}
if ((qflags & BUC_CURSED) && count_buc(olist, BUC_CURSED)) {
do_cursed = TRUE;
num_buc_types++;
}
if ((qflags & BUC_UNCURSED) && count_buc(olist, BUC_UNCURSED)) {
do_uncursed = TRUE;
num_buc_types++;
}
if ((qflags & BUC_UNKNOWN) && count_buc(olist, BUC_UNKNOWN)) {
do_buc_unknown = TRUE;
num_buc_types++;
}
ccount = count_categories(olist, qflags);
/* no point in actually showing a menu for a single category */
if (ccount == 1 && !do_unpaid && !(qflags & BILLED_TYPES)) {
if (ccount == 1 && !do_unpaid && num_buc_types <= 1 && !(qflags & BILLED_TYPES)) {
for (curr = olist; curr; curr = FOLLOW(curr, qflags)) {
if ((qflags & WORN_TYPES) &&
!(curr->owornmask & (W_ARMOR|W_RING|W_AMUL|W_TOOL|W_WEP|W_SWAPWEP|W_QUIVER)))
@@ -805,6 +824,35 @@ int how; /* type of query */
"Auto-select every item being worn" :
"Auto-select every item", MENU_UNSELECTED);
}
/* items with b/u/c/unknown if there are any */
if (do_blessed) {
invlet = 'B';
any.a_void = 0;
any.a_int = 'B';
add_menu(win, NO_GLYPH, &any, invlet, 0, ATR_NONE,
"Auto-select blessed items", MENU_UNSELECTED);
}
if (do_cursed) {
invlet = 'C';
any.a_void = 0;
any.a_int = 'C';
add_menu(win, NO_GLYPH, &any, invlet, 0, ATR_NONE,
"Auto-select cursed items", MENU_UNSELECTED);
}
if (do_uncursed) {
invlet = 'U';
any.a_void = 0;
any.a_int = 'U';
add_menu(win, NO_GLYPH, &any, invlet, 0, ATR_NONE,
"Auto-select known uncursed items", MENU_UNSELECTED);
}
if (do_buc_unknown) {
invlet = 'X';
any.a_void = 0;
any.a_int = 'X';
add_menu(win, NO_GLYPH, &any, invlet, 0, ATR_NONE,
"Auto-select un-b/u/c known items", MENU_UNSELECTED);
}
end_menu(win, qstr);
n = select_menu(win, how, pick_list);
destroy_nhwindow(win);