diff --git a/doc/fixes34.4 b/doc/fixes34.4 index c469edf68..16b7a1429 100644 --- a/doc/fixes34.4 +++ b/doc/fixes34.4 @@ -291,6 +291,7 @@ remove engravings at drawbridge location when it is opened, closed, or wrecked monster killed in midst of multi-shot volley throwing/shooting might cause freed memory to be accessed, potentially triggering a crash can't arm bear traps or land mines on Planes of Air or Water +statues that "come to life" when trap activates shouldn't start out sleeping Platform- and/or Interface-Specific Fixes diff --git a/src/trap.c b/src/trap.c index f53384490..48253228c 100644 --- a/src/trap.c +++ b/src/trap.c @@ -515,6 +515,13 @@ int *fail_reason; /* mimic statue becomes seen mimic; other hiders won't be hidden */ if (mon->m_ap_type) seemimic(mon); else mon->mundetected = FALSE; + mon->msleeping = 0; + if (cause == ANIMATE_NORMAL || cause == ANIMATE_SHATTER) { + /* trap always releases hostile monster */ + mon->mtame = 0; /* (might be petrified pet tossed onto trap) */ + mon->mpeaceful = 0; + set_malign(mon); + } comes_to_life = !canspotmon(mon) ? "disappears" : (nonliving(mon->data) || is_vampshifter(mon)) ?