floating down on a trap in which you're already trapped

this would re-trap you, extending your trap time

diff --git a/doc/fixes34.0 b/doc/fixes34.0
index 4cf2076b7c7336fdd43c44327e745327e01bd195..7fef2da8d94752d3b238ac6f7ac135673cc890f6 100644 (file)
--- a/doc/fixes34.0
+++ b/doc/fixes34.0
@@ -429,6 +429,7 @@ gold detection "materially poor" message inappropriate if you have hidden_gold()
 cannot reflect back an invisible umber hulk or medusa's attack
 monsters with M3_WANTSBOOK often couldn't move in the Wizard-level
 Vlad should want the Candelabrum
+if you float_down on a trap in which you're already trapped, don't retrap
 
 
 Platform- and/or Interface-Specific Fixes

diff --git a/src/trap.c b/src/trap.c
index 7142ffbe3f22753cbca5365cf907ef243ca7514f..2522f2ed620e7ecc5a995fcfa4fd1d0a3b89e230 100644 (file)
--- a/src/trap.c
+++ b/src/trap.c
@@ -2133,7 +2133,8 @@ long hmask, emask;     /* might cancel timeout */
                                break;
                        /* fall into next case */
                default:
-                       dotrap(trap, 0);
+                       if (!u.utrap) /* not already in the trap */
+                               dotrap(trap, 0);
        }
 
        if (!Is_airlevel(&u.uz) && !Is_waterlevel(&u.uz) && !u.uswallow &&