change appearance if polymorphing while mimicing

As per <Someone>:
> I had a game today where I was polymorphed (by a sink) into a mimic, and
> #monster-ed (hid).  The symbol on the map for me was ].  Then, I polymorphed
> again, this time into a kobold lord -- but the symbol remained ].  This
> seems wrong.
Handle this similar to the polyman code.

diff --git a/doc/fixes34.1 b/doc/fixes34.1
index 5cdcf2e584efc293844507fc68c18b9121265f3e..f9249e4a643c2c6cea9a888ddefc320299b9dcca 100644 (file)
--- a/doc/fixes34.1
+++ b/doc/fixes34.1
@@ -107,6 +107,7 @@ give more specific message when forbidden role attempts to use twoweapon mode
 avoid double billing if #loot causes a shop's bag of holding to explode
 when polymorphed, player killing a paper or straw golem via fire damage
        would kill the golem twice, resulting in an impossible error
+usually stop mimicing if you polymorph while using #monster mimic capability
 
 
 Platform- and/or Interface-Specific Fixes

diff --git a/src/polyself.c b/src/polyself.c
index d05437a7c1b2970313cfec1ab9a55c9a8e840d02..ade9ddf51a7e056a4c617ff9ec203c25a9bec9ae 100644 (file)
--- a/src/polyself.c
+++ b/src/polyself.c
@@ -356,6 +356,9 @@ int mntmp;
                youmonst.mappearance == GOLD_PIECE) {
            /* stop mimicking gold immediately */
            if (multi < 0) unmul("");
+       } else if (mons[mntmp].mlet != S_MIMIC) {
+           /* as in polyman() */
+           youmonst.m_ap_type = M_AP_NOTHING;
        }
        if (is_male(&mons[mntmp])) {
                if(flags.female) dochange = TRUE;