GOLDOBJ pickup handling (trunk only)

For GOLDOBJ configuration, relax the 52 object limit for inventory
when gold uses the special $ slot instead of a letter.  Takes care of an
old buglist entry from the beta testers.  [It will need to be revisited
if we ever implement multiple coin types that can't all fit in one slot.]

     Also for GOLDOBJ, prevents nymphs and monkeys from stealing coins,
since allowing that made their steal-item attack be a complete superset
of leprechaun's steal-gold attack.

src/uhitm.c

@@ -1478,7 +1478,8 @@ register struct attack *mattk;
 		    struct obj *mongold = findgold(mdef->minvent);
 	            if (mongold) {
 		        obj_extract_self(mongold);  
-		        if (merge_choice(invent, mongold) || inv_cnt() < 52) {
+			if (merge_choice(invent, mongold) ||
+				inv_cnt(FALSE) < 52) {
 			    addinv(mongold);
 			    Your("purse feels heavier.");
 			} else {