From f52c7b0de777b93a8eeb14953e9d741b4aa3cfec Mon Sep 17 00:00:00 2001
From: nhmall <nhmall@nethack.org>
Date: Tue, 25 Dec 2018 16:34:28 -0500
Subject: [PATCH] merge fix-up

---
 src/botl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/botl.c b/src/botl.c
index 30b27ae8e..4e4e56394 100644
--- a/src/botl.c
+++ b/src/botl.c
@@ -585,8 +585,8 @@ bot_via_windowport()
     Sprintf(g.blstats[idx][BL_GOLD].val, "%s:%ld",
             (iflags.in_dumplog || iflags.invis_goldsym) ? "$"
               : encglyph(objnum_to_glyph(GOLD_PIECE)),
-            blstats[idx][BL_GOLD].a.a_long);
-    valset[BL_GOLD] = TRUE; /* indicate val already set */
+            g.blstats[idx][BL_GOLD].a.a_long);
+    g.valset[BL_GOLD] = TRUE; /* indicate val already set */
 
     /* Power (magical energy) */
     g.blstats[idx][BL_ENE].a.a_int = min(u.uen, 9999);