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

fix object pickup

Browse Source 
Mentioned in the newsgroup:  picked up items have stopped merging with
compatible stacks in inventory.

The commit 0c51555849 by me on January 5
|
| fix #H6713 - unpaid_cost: object not on any bill
|
| Stealing a shop object from outside the shop with a grappling hook
| would result in that item being left marked 'unpaid' after the shop's
| bill was treated as being bought and not yet paid for.  This led to
| "unpaid_cost: object wasn't on any bill" every time inventory was
| examined.  The problem was caused by handling the shop robbery after
| removing the object from the floor but before adding it to inventory,
| so it couldn't be found to have its unpaid bit cleared.
|
inadvertently caused that.  The effect was actually deliberate but it
wasn't intended to be so widespread.  Handle extract/bill/addinv/rob
sequencing differently instead of overriding inventory merging.
This commit is contained in:
PatR
2018-01-21 16:30:58 -08:00
parent c59f9512c7
commit a40f0788bc
2 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/pickup.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 pickup.c $NHDT-Date: 1515144225 2018/01/05 09:23:45 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.193 $ */
/* NetHack 3.6 pickup.c $NHDT-Date: 1516581051 2018/01/22 00:30:51 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.194 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -1500,17 +1500,16 @@ struct obj *otmp;
boolean robshop = (!u.uswallow && otmp != uball && costly_spot(ox, oy));
obj_extract_self(otmp);
otmp->nomerge = 1;
result = addinv(otmp);
otmp->nomerge = 0;
newsym(ox, oy);
/* this used to be done before addinv(), but remote_burglary()
calls rob_shop() which calls setpaid() after moving costs of
unpaid items to shop debt; setpaid() calls clear_unpaid() for
lots of object chains, but 'otmp' wasn't on any of those so
remained flagged as an unpaid item in inventory, triggering
impossible() every time inventory was examined... */
/* for shop items, addinv() needs to be after addtobill() (so that
object merger can take otmp->unpaid into account) but before
remote_robbery() (which calls rob_shop() which calls setpaid()
after moving costs of unpaid items to shop debt; setpaid()
calls clear_unpaid() for lots of object chains, but 'otmp' isn't
on any of those between obj_extract_self() and addinv(); for
3.6.0, 'otmp' remained flagged as an unpaid item in inventory
and triggered impossible() every time inventory was examined) */
if (robshop) {
char saveushops[5], fakeshop[2];
@@ -1524,10 +1523,14 @@ struct obj *otmp;
/* sets obj->unpaid if necessary */
addtobill(otmp, TRUE, FALSE, FALSE);
Strcpy(u.ushops, saveushops);
/* if you're outside the shop, make shk notice */
if (!index(u.ushops, *fakeshop))
remote_burglary(ox, oy);
robshop = otmp->unpaid && !index(u.ushops, *fakeshop);
}
result = addinv(otmp);
/* if you're taking a shop item from outside the shop, make shk notice */
if (robshop)
remote_burglary(ox, oy);
return result;
}