Merge branch 'NetHack-3.6.2' part 2
This commit is contained in:
@@ -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);
|
||||
|
||||
|
||||
@@ -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 */
|
||||
|
||||
Reference in New Issue
Block a user