sync changes since last snapshot

win/Qt/qt_win.cpp

@@ -2441,7 +2441,11 @@ void NetHackQtStatusWindow::updateStats()
 	dlevel.setLabel(buf,(long)depth(&u.uz));
     }
 
-    gold.setLabel("Au:",(long)u.ugold);
+#ifndef GOLDOBJ
+    gold.setLabel("Au:", u.ugold);
+#else
+    gold.setLabel("Au:", money_cnt(invent));
+#endif
     if (u.mtimedone) {
 	// You're a monster!
 
@@ -3166,7 +3170,11 @@ static char** rip_line=0;
     Sprintf(rip_line[NAME_LINE], "%s", plname);
 
     /* Put $ on stone */
+#ifndef GOLDOBJ
     Sprintf(rip_line[GOLD_LINE], "%ld Au", u.ugold);
+#else
+    Sprintf(rip_line[GOLD_LINE], "%ld Au", done_money);
+#endif
 
     /* Put together death description */
     switch (killer_format) {