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

U665: gold and unpaid containers

Browse Source 
The choice was to avoid one of the two sellobj() calls in in_container.
Since I liked the message ordering "put gold into... credit" better than
"credit... put gold into", the code now avoids the 1st sellobj call for coins.
This commit is contained in:
cohrs
2003-09-23 22:01:14 +00:00
parent 2d59f9d8db
commit d706e044b4
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/fixes34.3
View File

@@ -26,6 +26,7 @@ open_levelfile_exclusively() was showing the return value -1 in a panic message,
it was inappropriate to have a ghost "appear" in desecrated temple when it was inappropriate to have a ghost "appear" in desecrated temple when
you were blind and without telepathy you were blind and without telepathy
accept wish for "grey spell book" not just "grey spellbook" accept wish for "grey spell book" not just "grey spellbook"
do not double credit when putting gold into an unpaid container
Platform- and/or Interface-Specific Fixes Platform- and/or Interface-Specific Fixes

5
src/pickup.c
View File

@@ -1829,8 +1829,9 @@ register struct obj *obj;
if (current_container->no_charge && !obj->unpaid) { if (current_container->no_charge && !obj->unpaid) {
/* don't sell when putting the item into your own container */ /* don't sell when putting the item into your own container */
obj->no_charge = 1; obj->no_charge = 1;
} else { } else if (obj->oclass != COIN_CLASS) {
/* sellobj() will take an unpaid item off the shop bill */ /* sellobj() will take an unpaid item off the shop bill
* note: coins are handled later */
was_unpaid = obj->unpaid ? TRUE : FALSE; was_unpaid = obj->unpaid ? TRUE : FALSE;
sellobj_state(SELL_DELIBERATE); sellobj_state(SELL_DELIBERATE);
sellobj(obj, u.ux, u.uy); sellobj(obj, u.ux, u.uy);