From: cohrs <cohrs>
Date: Fri, 22 Nov 2002 03:55:48 +0000 (+0000)
Subject: U154 - crash on teleport from engulfing mon
X-Git-Tag: MOVE2GIT~2326
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f155a4b0d35b00614fd73db10da89261a1b1fa32;p=nethack

U154 - crash on teleport from engulfing mon
teleds now needs to handle the case where an uncarried ball starts out
inactive, but becomes active as a result of teleporting out of a monster
while engulfed.
---

diff --git a/doc/fixes34.1 b/doc/fixes34.1
index 10b88379d..f348ba676 100644
--- a/doc/fixes34.1
+++ b/doc/fixes34.1
@@ -312,6 +312,8 @@ minor experience calculation tweaks
 level telporting out of the dungeon while carrying unpaid shop goods would
 	trigger "not on any bill" warnings during final inventory disclosure
 only hard helmets protect against falling piercers
+don't crash teleporting out of a monster while engulfed, punished but not
+	carrying the ball
 
 
 Platform- and/or Interface-Specific Fixes
diff --git a/src/teleport.c b/src/teleport.c
index 0beb02aa1..755ed3528 100644
--- a/src/teleport.c
+++ b/src/teleport.c
@@ -266,6 +266,11 @@ boolean allow_drag;
 
 	if (u.uswallow) {
 		u.uswldtim = u.uswallow = 0;
+		if (Punished && !ball_active) {
+		    /* ensure ball placement, like unstuck */
+		    ball_active = TRUE;
+		    allow_drag = FALSE;
+		}
 		docrt();
 	}
 	if (ball_active) {