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

unpaid shop goods in inventory (trunk only)

Browse Source 
Inventory display adds "(unpaid, N zorkmids)" to carried unpaid
items, but it didn't show anything comparable for indirect unpaid ones
(hero-owned containers holding shop-owned objects).  Now it will include
"(contents, N zorkmids)" in such cases.
This commit is contained in:
nethack.rankin
2006-11-04 07:49:49 +00:00
parent 86249edbf9
commit bc9f91fce5
6 changed files with 46 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/invent.c
View File

@@ -1986,12 +1986,12 @@ dounpaid()
if (count == 1) {
marker = (struct obj *) 0;
otmp = find_unpaid(invent, &marker);
cost = unpaid_cost(otmp);
otmp->unpaid = 0; /* suppress "(unpaid)" suffix */
cost = unpaid_cost(otmp, FALSE);
iflags.suppress_price++; /* suppress "(unpaid)" suffix */
pline("%s", xprname(otmp, distant_name(otmp, doname),
carried(otmp) ? otmp->invlet : CONTAINED_SYM,
TRUE, cost, 0L));
otmp->unpaid = 1; /*(wouldn't be here if this wasn't true)*/
iflags.suppress_price--;
return;
}
@@ -2011,11 +2011,11 @@ dounpaid()
classcount++;
}
totcost += cost = unpaid_cost(otmp);
otmp->unpaid = 0; /* suppress "(unpaid)" suffix */
totcost += cost = unpaid_cost(otmp, FALSE);
iflags.suppress_price++; /* suppress "(unpaid)" suffix */
putstr(win, 0, xprname(otmp, distant_name(otmp, doname),
ilet, TRUE, cost, 0L));
otmp->unpaid = 1;
iflags.suppress_price--;
num_so_far++;
}
}
@@ -2037,14 +2037,14 @@ dounpaid()
marker = (struct obj *) 0; /* haven't found any */
while (find_unpaid(otmp->cobj, &marker)) {
totcost += cost = unpaid_cost(marker);
totcost += cost = unpaid_cost(marker, FALSE);
contcost += cost;
if (otmp->cknown) {
marker->unpaid = 0; /* suppress "(unpaid)" suffix */
iflags.suppress_price++; /* suppress "(unpaid)" sfx */
putstr(win, 0,
xprname(marker, distant_name(marker, doname),
CONTAINED_SYM, TRUE, cost, 0L));
marker->unpaid = 1;
iflags.suppress_price--;
}
}
if (!otmp->cknown) {