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

extend sanity_check to shop items

Browse Source 
Make object sanity checks examine obj->unpaid and obj->no_charge.

Shopping is complicated; there might be corner cases that aren't
handled correctly.
This commit is contained in:
PatR
2022-11-21 13:16:51 -08:00
parent c3a8850a86
commit 6bf42b8891
2 changed files with 58 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/shk.c
View File

@@ -863,31 +863,32 @@ shop_keeper(char rmno)
}
boolean
tended_shop(struct mkroom* sroom)
tended_shop(struct mkroom *sroom)
{
struct monst *mtmp = sroom->resident;
return !mtmp ? FALSE : (boolean) inhishop(mtmp);
}
struct bill_x *
static struct bill_x *
onbill(struct obj *obj, struct monst *shkp, boolean silent)
{
if (shkp) {
register struct bill_x *bp = ESHK(shkp)->bill_p;
register int ct = ESHK(shkp)->billct;
struct bill_x *bp;
int ct;
while (--ct >= 0)
for (ct = ESHK(shkp)->billct, bp = ESHK(shkp)->bill_p;
ct > 0; --ct, ++bp) {
if (bp->bo_id == obj->o_id) {
if (!obj->unpaid)
pline("onbill: paid obj on bill?");
impossible("onbill: paid obj on bill?");
return bp;
} else {
bp++;
}
}
}
if (obj->unpaid && !silent)
pline("onbill: unpaid obj not on bill?");
impossible("onbill: unpaid obj %s?",
shkp ? "without shopkeeper" : "not on shk's bill");
return (struct bill_x *) 0;
}