hangups with temp gold in inventory

- Implement Michael's suggestion of marking temp gold put in inventory
so it can be cleaned up during restore.

doc/fixes34.1

@@ -109,6 +109,7 @@ when polymorphed, player killing a paper or straw golem via fire damage
 	would kill the golem twice, resulting in an impossible error
 usually stop mimicing if you polymorph while using #monster mimic capability
 under !GOLDOBJ, gold shouldn't disappear if you try to throw it at yourself
+under !GOLDOBJ, remove temp gold from inventory during restore
 
 
 Platform- and/or Interface-Specific Fixes

src/do.c

@@ -614,6 +614,7 @@ int retry;
 	/* Hack: gold is not in the inventory, so make a gold object
 	   and put it at the head of the inventory list. */
 	u_gold = mkgoldobj(u.ugold);	/* removes from u.ugold */
+	u_gold->in_use = TRUE;
 	u.ugold = u_gold->quan;		/* put the gold back */
 	assigninvlet(u_gold);		/* might end up as NOINVSYM */
 	u_gold->nobj = invent;
@@ -686,6 +687,7 @@ int retry;
 	/* didn't drop [all of] it */
 	u_gold = invent;
 	invent = u_gold->nobj;
+	u_gold->in_use = FALSE;
 	dealloc_obj(u_gold);
 	update_inventory();
     }

src/invent.c

@@ -480,6 +480,7 @@ struct obj *obj;
 	if (obj->oclass == GOLD_CLASS) {
 #ifndef GOLDOBJ
 		u.ugold -= obj->quan;
+		obj->in_use = FALSE;
 #endif
 		flags.botl = 1;
 		return;

src/pickup.c

@@ -2084,6 +2084,7 @@ ask_again2:
 		 * and put it at the head of the inventory list.
 		 */
 		u_gold = mkgoldobj(u.ugold);	/* removes from u.ugold */
+		u_gold->in_use = TRUE;
 		u.ugold = u_gold->quan;		/* put the gold back */
 		assigninvlet(u_gold);		/* might end up as NOINVSYM */
 		u_gold->nobj = invent;
@@ -2118,6 +2119,7 @@ ask_again2:
 	    /* didn't stash [all of] it */
 	    u_gold = invent;
 	    invent = u_gold->nobj;
+	    u_gold->in_use = FALSE;
 	    dealloc_obj(u_gold);
 	}
 #endif

src/restore.c

@@ -106,6 +106,17 @@ boolean quietly;
 
 	for (otmp = invent; otmp; otmp = otmp2) {
 	    otmp2 = otmp->nobj;
+#ifndef GOLDOBJ
+	    if (otmp->oclass == GOLD_CLASS) {
+		/* in_use gold is created by some menu operations */
+		if (!otmp->in_use) {
+		    impossible("inven_inuse: !in_use gold in inventory");
+		}
+		extract_nobj(otmp, &invent);
+		otmp->in_use = FALSE;
+		dealloc_obj(otmp);
+	    } else
+#endif /* GOLDOBJ */
 	    if (otmp->in_use) {
 		if (!quietly) pline("Finishing off %s...", xname(otmp));
 		useup(otmp);

src/trap.c

@@ -2494,7 +2494,6 @@ boolean *lostsome;
 {
 	int invc = inv_cnt();
 
-
 	while (near_capacity() > (Punished ? UNENCUMBERED : SLT_ENCUMBER)) {
 	    register struct obj *obj, *otmp = (struct obj *)0;
 	    register int i;
@@ -2534,6 +2533,7 @@ boolean *lostsome;
 		     * and put it at the head of the inventory list.
 		     */
 		    obj = mkgoldobj(u.ugold);    /* removes from u.ugold */
+		    obj->in_use = TRUE;
 		    u.ugold = obj->quan;         /* put the gold back */
 		    assigninvlet(obj);           /* might end up as NOINVSYM */
 		    obj->nobj = invent;