From: cohrs <cohrs>
Date: Tue, 23 Sep 2003 22:01:14 +0000 (+0000)
Subject: U665: gold and unpaid containers
X-Git-Tag: MOVE2GIT~1760
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d706e044b487a5e3493bda33791f74e17dbc0b2e;p=nethack

U665: gold and unpaid containers
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.
---

diff --git a/doc/fixes34.3 b/doc/fixes34.3
index fba939308..dc745af6c 100644
--- a/doc/fixes34.3
+++ b/doc/fixes34.3
@@ -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 
 	you were blind and without telepathy
 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
diff --git a/src/pickup.c b/src/pickup.c
index d6db5730d..e91611888 100644
--- a/src/pickup.c
+++ b/src/pickup.c
@@ -1829,8 +1829,9 @@ register struct obj *obj;
 	    if (current_container->no_charge && !obj->unpaid) {
 		/* don't sell when putting the item into your own container */
 		obj->no_charge = 1;
-	    } else {
-		/* sellobj() will take an unpaid item off the shop bill */
+	    } else if (obj->oclass != COIN_CLASS) {
+		/* sellobj() will take an unpaid item off the shop bill
+		 * note: coins are handled later */
 		was_unpaid = obj->unpaid ? TRUE : FALSE;
 		sellobj_state(SELL_DELIBERATE);
 		sellobj(obj, u.ux, u.uy);