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

unpaid object sanity checking

Browse Source 
Handle items in gaps of a wall shared between adjacent shops.

Make handling of shop boundaries more explicit:  walls, the door,
and the "free spot" by the door aren't classified as 'costly' but
obj->unpaid and obj->no_charge are valid there.

Move unpaid/no_charge checking into its own routine to unclutter
objlist_sanity().

Pushing a shop-owned boulder to the free spot or doorway or gap in
wall triggers the sanity check for the time being.
This commit is contained in:
PatR
2022-11-23 16:41:12 -08:00
parent 3398b34cc7
commit e49c772f13
3 changed files with 109 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/shk.c
View File

@@ -862,6 +862,32 @@ shop_keeper(char rmno)
return shkp;
}
/* find the shopkeeper who owns 'obj'; needed to handle shared shop walls */
struct monst *
find_objowner(
struct obj *obj,
coordxy x, coordxy y) /* caller passes obj's location since obj->ox,oy
* might be stale; don't update coordinates here
* because if we're called duing sanity checking
* they shouldn't be modified */
{
struct monst *shkp, *deflt_shkp = 0;
char *roomindx, *where = in_rooms(x, y, SHOPBASE);
/* conceptually object could be inside up to four rooms simultaneously;
in practice it will usually be one room but can sometimes be two;
check shk and bill for each room rather than just the first;
fallback to the first shk if obj isn't on the relevant bill(s) */
for (roomindx = where; *roomindx; ++roomindx)
if ((shkp = shop_keeper(*roomindx)) != 0) {
if (onshopbill(obj, shkp, TRUE))
return shkp;
if (!deflt_shkp)
deflt_shkp = shkp;
}
return deflt_shkp;
}
boolean
tended_shop(struct mkroom *sroom)
{
@@ -4384,7 +4410,7 @@ pay_for_damage(const char* dmgstr, boolean cant_mollify)
/* called in dokick.c when we kick an object that might be in a store */
boolean
costly_spot(register coordxy x, register coordxy y)
costly_spot(coordxy x, coordxy y)
{
struct monst *shkp;
struct eshk *eshkp;
@@ -4399,6 +4425,24 @@ costly_spot(register coordxy x, register coordxy y)
&& !(x == eshkp->shk.x && y == eshkp->shk.y));
}
/* called by sanity checking when an unpaid or no_charge item is not at a
costly_spot; it might still be within the boundary of the shop; if so,
those flags are still valid */
boolean
costly_adjacent(
struct monst *shkp,
coordxy x, coordxy y)
{
struct eshk *eshkp;
if (!shkp || !inhishop(shkp) || !isok(x, y))
return FALSE;
eshkp = ESHK(shkp);
/* adjacent if <x,y> is a shop wall spot, including door;
also treat "free spot" one step inside the door as adjacent */
return (levl[x][y].edge || (x == eshkp->shk.x && y == eshkp->shk.y));
}
/* called by dotalk(sounds.c) when #chatting; returns obj if location
contains shop goods and shopkeeper is willing & able to speak */
struct obj *