statue of stone golem animates as flesh golem

diff --git a/doc/fixes35.0 b/doc/fixes35.0
index 4ac8aedfba39969fdcac0fc3fa017ae9e146baf8..18e9013d3ffa6a95621e5e67f11c52639cceaac6 100644 (file)
--- a/doc/fixes35.0
+++ b/doc/fixes35.0
@@ -10,6 +10,7 @@ Never say "It moves only reluctantly"
 expert fireball/cone of cold could not target a monster seen only with
        infravision or ESP
 display "lotus juice", not "lotu juice" for the fruit juice name
+statue of Stone golem hit with stone-to-flesh spell animates as flesh golem
 
 
 Platform- and/or Interface-Specific Fixes

diff --git a/src/trap.c b/src/trap.c
index 330e603cdc3bcad85c39a1b0b539a8eafd8d4955..a8febf41e8b4df50a6a64e1976197d6ad787e435 100644 (file)
--- a/src/trap.c
+++ b/src/trap.c
@@ -417,13 +417,17 @@ int *fail_reason;
            if (mon && mon->mtame && !mon->isminion)
                wary_dog(mon, TRUE);
        } else {
+           /* statue of Stone golem hit with Stone-to-flesh becomes flesh golem */
+           if (statue->corpsenm == PM_STONE_GOLEM && cause == ANIMATE_SPELL)
+               mptr = &mons[PM_FLESH_GOLEM];
+           else
+               mptr = &mons[statue->corpsenm];
            /*
             * Guard against someone wishing for a statue of a unique monster
             * (which is allowed in normal play) and then tossing it onto the
             * [detected or guessed] location of a statue trap.  Normally the
             * uppermost statue is the one which would be activated.
             */
-           mptr = &mons[statue->corpsenm];
            if (mptr->geno & G_UNIQ) {
                if (fail_reason) *fail_reason = AS_MON_IS_UNIQUE;
                return (struct monst *)0;