From 20ca1ab0e47be0de972147fe96c87732a706cd23 Mon Sep 17 00:00:00 2001
From: nhmall <nhmall@nethack.org>
Date: Mon, 22 Apr 2019 14:42:49 -0400
Subject: [PATCH] Merge branch 'NetHack-3.6.2' part 2

---
 src/mhitu.c    | 2 +-
 src/polyself.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mhitu.c b/src/mhitu.c
index 55efd9d92..f4b8d0263 100644
--- a/src/mhitu.c
+++ b/src/mhitu.c
@@ -521,7 +521,7 @@ register struct monst *mtmp;
     }
 
     /* hero might be a mimic, concealed via #monster */
-    if (youmonst.data->mlet == S_MIMIC && U_AP_TYPE && !range2
+    if (g.youmonst.data->mlet == S_MIMIC && U_AP_TYPE && !range2
         && foundyou && !u.uswallow) {
         boolean sticky = sticks(g.youmonst.data);
 
diff --git a/src/polyself.c b/src/polyself.c
index 1d623bdd9..9634d0c76 100644
--- a/src/polyself.c
+++ b/src/polyself.c
@@ -621,7 +621,7 @@ int mntmp;
     }
 
     /* if stuck mimicking gold, stop immediately */
-    if (multi < 0 && U_AP_TYPE == M_AP_OBJECT
+    if (g.multi < 0 && U_AP_TYPE == M_AP_OBJECT
         && g.youmonst.data->mlet != S_MIMIC)
         unmul("");
     /* if becoming a non-mimic, stop mimicking anything */