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

Merge branch 'NetHack-3.7' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.7

Browse Source
This commit is contained in:
nhmall
2020-02-09 14:57:15 -05:00
parent c7c0c87859 6fd51c29ef
commit 2ed0270e7e
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/pickup.c
View File

@@ -31,6 +31,7 @@ static long FDECL(carry_count, (struct obj *, struct obj *, long,
static int FDECL(lift_object, (struct obj *, struct obj *, long *, static int FDECL(lift_object, (struct obj *, struct obj *, long *,
BOOLEAN_P)); BOOLEAN_P));
static boolean FDECL(mbag_explodes, (struct obj *, int)); static boolean FDECL(mbag_explodes, (struct obj *, int));
static boolean NDECL(is_boh_item_gone);
static long FDECL(boh_loss, (struct obj *container, int)); static long FDECL(boh_loss, (struct obj *container, int));
static int FDECL(in_container, (struct obj *)); static int FDECL(in_container, (struct obj *));
static int FDECL(out_container, (struct obj *)); static int FDECL(out_container, (struct obj *));
@@ -2162,6 +2163,12 @@ int depthin;
return FALSE; return FALSE;
} }
static boolean
is_boh_item_gone()
{
return (boolean) (!rn2(13));
}
static long static long
boh_loss(container, held) boh_loss(container, held)
struct obj *container; struct obj *container;
@@ -2174,7 +2181,7 @@ int held;
for (curr = container->cobj; curr; curr = otmp) { for (curr = container->cobj; curr; curr = otmp) {
otmp = curr->nobj; otmp = curr->nobj;
if (!rn2(13)) { if (is_boh_item_gone()) {
obj_extract_self(curr); obj_extract_self(curr);
loss += mbag_item_gone(held, curr); loss += mbag_item_gone(held, curr);
} }
@@ -3288,7 +3295,7 @@ struct obj *box; /* or bag */
if (box->otyp == ICE_BOX) { if (box->otyp == ICE_BOX) {
removed_from_icebox(otmp); /* resume rotting for corpse */ removed_from_icebox(otmp); /* resume rotting for corpse */
} else if (cursed_mbag && !rn2(13)) { } else if (cursed_mbag && is_boh_item_gone()) {
loss += mbag_item_gone(held, otmp); loss += mbag_item_gone(held, otmp);
/* abbreviated drop format is no longer appropriate */ /* abbreviated drop format is no longer appropriate */
terse = FALSE; terse = FALSE;