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

this would re-trap you, extending your trap time
2002-02-13 04:30:28 +00:00
parent 5b242aafce
commit aa989f2452
2 changed files with 3 additions and 1 deletions
--- 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 &&