more mimic follow-up bits

Address some complaints about an earlier patch.
This commit is contained in:
nethack.allison
2003-01-09 02:37:03 +00:00
parent f9b5bf82c5
commit 5336419465
4 changed files with 13 additions and 25 deletions

View File

@@ -33,9 +33,8 @@ polyman(fmt, arg)
const char *fmt, *arg;
{
boolean sticky = sticks(youmonst.data) && u.ustuck && !u.uswallow,
was_mimicking = (youmonst.m_ap_type == M_AP_OBJECT &&
(youmonst.mappearance > STRANGE_OBJECT &&
youmonst.mappearance < NUM_OBJECTS));
was_mimicking = (youmonst.m_ap_type == M_AP_OBJECT);
boolean was_blind = !!Blind;
if (Upolyd) {
@@ -332,9 +331,6 @@ int mntmp;
{
boolean sticky = sticks(youmonst.data) && u.ustuck && !u.uswallow,
was_blind = !!Blind, dochange = FALSE;
boolean was_mimicking = (youmonst.m_ap_type == M_AP_OBJECT &&
(youmonst.mappearance > STRANGE_OBJECT &&
youmonst.mappearance < NUM_OBJECTS));
int mlvl;
if (mvitals[mntmp].mvflags & G_GENOD) { /* allow G_EXTINCT */
@@ -360,7 +356,7 @@ int mntmp;
flags.female = u.mfemale;
}
if (was_mimicking) {
if (youmonst.m_ap_type) {
/* stop mimicking immediately */
if (multi < 0) unmul("");
} else if (mons[mntmp].mlet != S_MIMIC) {