Make GOLDOBJ unconditional.

win/X11/winstat.c

@@ -600,11 +600,7 @@ update_fancy_status(wp)
 
 	    case F_NAME:	val = (long) 0L; break;	/* special */
 	    case F_DLEVEL:	val = (long) 0L; break;	/* special */
-#ifndef GOLDOBJ
-	    case F_GOLD:	val = (long) u.ugold; break;
-#else
 	    case F_GOLD:	val = money_cnt(invent); break;
-#endif
 	    case F_HP:		val = (long) (u.mtimedone ?
 					      (u.mh  > 0 ? u.mh  : 0):
 					      (u.uhp > 0 ? u.uhp : 0)); break;

win/X11/wintext.c

@@ -469,11 +469,7 @@ calculate_rip_text(int how, time_t when)
 
 	/* Put $ on stone */
 	Sprintf(rip_line[GOLD_LINE], "%ld Au",
-#ifndef GOLDOBJ
-		u.ugold);
-#else
 		done_money);
-#endif
 	/* Put together death description */
 	formatkiller(buf, sizeof buf, how);