From: cohrs <cohrs>
Date: Wed, 13 Feb 2002 04:30:28 +0000 (+0000)
Subject: floating down on a trap in which you're already trapped
X-Git-Tag: MOVE2GIT~3184
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aa989f24520bc0a3f35d817947f4031b18495171;p=nethack

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 4cf2076b7..7fef2da8d 100644
--- 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 7142ffbe3..2522f2ed6 100644
--- 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 &&