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.
This commit is contained in:
cohrs
2002-11-22 03:55:48 +00:00
parent d3e2f53910
commit f155a4b0d3
2 changed files with 7 additions and 0 deletions

View File

@@ -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

View File

@@ -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) {