From: cohrs <cohrs>
Date: Mon, 17 Mar 2003 05:38:36 +0000 (+0000)
Subject: U337 - putting gold in a shop container
X-Git-Tag: MOVE2GIT~2068
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f159dd596c08b1f1d8c5a5b3da7e985945ce46d1;p=nethack

U337 - putting gold in a shop container
When you drop a container in a shop, gold in that container is added to
your credit.  However, if you put gold into a container after it was already
on the shop floor, no credit was given.  Then when you picked up the bag or
tried to take out the gold, you'd be debited for it.  This change causes
in_container to handle gold the same as container dropping does.
---

diff --git a/doc/fixes34.2 b/doc/fixes34.2
index 1798547c7..f23b53c34 100644
--- a/doc/fixes34.2
+++ b/doc/fixes34.2
@@ -18,6 +18,8 @@ perform artifact touch checks when putting on accessories
 missing noun in message when horns pierce through your helmet
 don't use hcolor() for trapped chest gases when you aren't hallucinating
 the age of a potion of oil from a bones file wasn't being handled correctly
+putting gold in a container on the shop floor wasn't credited the way
+	gold already in the container when dropped was credited
 
 
 Platform- and/or Interface-Specific Fixes
@@ -38,4 +40,3 @@ win32tty: keystroke handlers can be dynamically loaded to assist in resolving
 	internationalization issues
 
 
-
diff --git a/src/pickup.c b/src/pickup.c
index 351b8e862..07ac3228d 100644
--- a/src/pickup.c
+++ b/src/pickup.c
@@ -1802,6 +1802,9 @@ register struct obj *obj;
 	    Strcpy(buf, the(xname(current_container)));
 	    You("put %s into %s.", doname(obj), buf);
 
+	    /* gold in container always needs to be added to credit */
+	    if (floor_container && obj->oclass == COIN_CLASS)
+		sellobj(obj, current_container->ox, current_container->oy);
 	    (void) add_to_container(current_container, obj);
 	    current_container->owt = weight(current_container);
 	}