C340-18 redux

Fix the test of otrapped in ohitmon pointed out by <Someone> that was causing
my previous fix to do the exact opposite of the intended behavior.

diff --git a/doc/fixes34.4 b/doc/fixes34.4
index 9fbb077a1c91e787b503ae5539de8554c3fcf7f1..2b144909b8c7bf39429968aacb96c087f24fb058 100644 (file)
--- a/doc/fixes34.4
+++ b/doc/fixes34.4
@@ -46,6 +46,7 @@ handle lava when removing or losing water walking boots
 fix incomplete sentence occuring when unique monster's corpse fell down stairs
 fractured boulders or statues produced inconsistent object settings on the
        resulting rocks
+really fix rolling boulder bug C340-18, the previous "fix" reversed the test
 
 
 Platform- and/or Interface-Specific Fixes

diff --git a/src/mthrowu.c b/src/mthrowu.c
index 3fbc6c862f72969f2d44d09679feca2c7e4a7169..b6d25b9888577b9780736e1fd25531278082b65a 100644 (file)
--- a/src/mthrowu.c
+++ b/src/mthrowu.c
@@ -206,7 +206,7 @@ boolean verbose;  /* give message(s) even when you can't see what happened */
                        ? "destroyed" : "killed");
                /* don't blame hero for unknown rolling boulder trap */
                if (!context.mon_moving &&
-                   (otmp->otyp != BOULDER || range >= 0 || !otmp->otrapped))
+                   (otmp->otyp != BOULDER || range >= 0 || otmp->otrapped))
                    xkilled(mtmp,0);
                else mondied(mtmp);
            }