Merge branch 'NetHack-3.6.2' part 2

This commit is contained in:
nhmall
2019-04-22 14:42:49 -04:00
parent d15496ba31
commit 20ca1ab0e4
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -521,7 +521,7 @@ register struct monst *mtmp;
} }
/* hero might be a mimic, concealed via #monster */ /* 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) { && foundyou && !u.uswallow) {
boolean sticky = sticks(g.youmonst.data); boolean sticky = sticks(g.youmonst.data);
+1 -1
View File
@@ -621,7 +621,7 @@ int mntmp;
} }
/* if stuck mimicking gold, stop immediately */ /* 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) && g.youmonst.data->mlet != S_MIMIC)
unmul(""); unmul("");
/* if becoming a non-mimic, stop mimicking anything */ /* if becoming a non-mimic, stop mimicking anything */