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

Rename/invert 'pickup_dropped' to 'dropped_nopick'

Browse Source
This commit is contained in:
Michael Meyer
2023-11-16 23:38:21 -05:00
committed by PatR
parent d7d1c1476d
commit e2e89cb93e
7 changed files with 21 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/options.c
View File

@@ -8594,7 +8594,7 @@ doset_simple_menu(void)
spelling of their names; emphasize what it means */
if (allopt[i].idx == opt_pickup_types
|| allopt[i].idx == opt_pickup_thrown
|| allopt[i].idx == opt_pickup_dropped)
|| allopt[i].idx == opt_dropped_nopick)
Strcat(buf, " (for autopickup)");
add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0,
ATR_NONE, NO_COLOR, buf, MENU_ITEMFLAGS_NONE);

4
src/pickup.c
View File

@@ -904,10 +904,10 @@ autopick_testobj(struct obj *otmp, boolean calc_costly)
if (costly && !otmp->no_charge)
return FALSE;
/* pickup_thrown/!pickup_dropped override pickup_types and exceptions */
/* pickup_thrown/nopick_dropped override pickup_types and exceptions */
if (flags.pickup_thrown && otmp->was_thrown)
return TRUE;
if (!flags.pickup_dropped && otmp->was_dropped)
if (flags.nopick_dropped && otmp->was_dropped)
return FALSE;
/* check for pickup_types */