grateful frozen monsters

a frozen (possibly sleeping) monster cannot be grateful unless it wakes up.
From a bug report.  The pit case can only happen if mfrozen is
non-zero, but other traps may leave msleeping set as well.

diff --git a/doc/fixes34.1 b/doc/fixes34.1
index 2bc5488091de8998fdab0569290598a580679412..d699c2753352d273af624a0ec340535cd85055c7 100644 (file)
--- a/doc/fixes34.1
+++ b/doc/fixes34.1
@@ -132,6 +132,7 @@ headstone writing was using the adjective "weird" when engraving with a wand
 don't report "you were riding" if you die as a result of dismounting
 allow #untrapping of chests that are co-located with floor traps and hero
 unmap "I" symbols when searching while blind and levitating
+monsters that are frozen or sleeping cannot be grateful for untrapping
 
 
 Platform- and/or Interface-Specific Fixes

diff --git a/src/trap.c b/src/trap.c
index d5cc2adf10742034c996018bc199fb1d2b6904ee..eafc20303727ff9be7d5e889262fb9a22fda23bf 100644 (file)
--- a/src/trap.c
+++ b/src/trap.c
@@ -2886,6 +2886,7 @@ struct monst *mtmp;
 {
        if (!ttmp->madeby_u) {
            if (rnl(10) < 8 && !mtmp->mpeaceful &&
+                   !mtmp->msleeping && !mtmp->mfrozen &&
                    !mindless(mtmp->data) &&
                    mtmp->data->mlet != S_HUMAN) {
                mtmp->mpeaceful = 1;