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

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

View File

@@ -702,13 +702,13 @@ boolean broken;
if (broken ||
!costly_spot(x, y) || *in_rooms(x, y, SHOPBASE) != *u.ushops) {
/* thrown out of a shop or into a different shop */
if (count_unpaid(obj))
if (is_unpaid(obj))
(void)stolen_value(obj, u.ux, u.uy,
(boolean)shkp->mpeaceful, FALSE);
if (broken) obj->no_charge = 1;
} else {
if (costly_spot(u.ux, u.uy) && costly_spot(x, y)) {
if (count_unpaid(obj))
if (is_unpaid(obj))
subfrombill(obj, shkp);
else if (x != shkp->mx || y != shkp->my)
sellobj(obj, x, y);