Make GOLDOBJ unconditional.

src/end.c

@@ -998,13 +998,8 @@ die:
 	{
 	    int deepest = deepest_lev_reached(FALSE);
 
-#ifndef GOLDOBJ
-	    umoney = u.ugold;
-	    tmp = u.ugold0;
-#else
 	    umoney = money_cnt(invent);
 	    tmp = u.umoney0;
-#endif
 	    umoney += hidden_gold();	/* accumulate gold from containers */
 	    tmp = umoney - tmp;		/* net gain */
 
@@ -1046,11 +1041,7 @@ die:
 
 	/* update gold for the rip output, which can't use hidden_gold()
 	   (containers will be gone by then if bones just got saved...) */
-#ifndef GOLDOBJ
-	u.ugold = umoney;
-#else
 	done_money = umoney;
-#endif
 
 	/* clean up unneeded windows */
 	if (have_windows) {