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

"(contents, N zorkmids)" fix (trunk only)

Browse Source 
Some code I recently added was misusing count_unpaid() and would
traverse some or all of inventory instead of just container's contents
when looking for unpaid items.  Add mew routine `is_unpaid(obj)' to do
what I was intending to do with count_unpaid().
This commit is contained in:
nethack.rankin
2006-11-09 05:20:00 +00:00
parent b5633d17c3
commit ef2085bcaf
5 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/shk.c
View File

@@ -769,6 +769,14 @@ register boolean silent;
return (struct bill_x *)0;
}
/* check whether an object or any of its contents belongs to a shop */
boolean
is_unpaid(obj)
struct obj *obj;
{
return (obj->unpaid || (Has_contents(obj) && count_unpaid(obj->cobj)));
}
/* Delete the contents of the given object. */
void
delete_contents(obj)
@@ -2621,14 +2629,13 @@ xchar x, y;
/* get one case out of the way: nothing to sell, and no gold */
if (!isgold && ((offer + gltmp) == 0L || sell_how == SELL_DONTSELL)) {
boolean unpaid = (obj->unpaid ||
(container && count_unpaid(obj->cobj)));
boolean unpaid = is_unpaid(obj);
if(container) {
dropped_container(obj, shkp, FALSE);
if(!obj->unpaid && !saleitem)
obj->no_charge = 1;
if(obj->unpaid || count_unpaid(obj->cobj))
if (unpaid)
subfrombill(obj, shkp);
} else obj->no_charge = 1;