From 45612f9add00eff05c54532fbddfef0432a5663c Mon Sep 17 00:00:00 2001 From: mazmazz Date: Wed, 15 Aug 2018 13:59:27 -0400 Subject: [PATCH] Recalc capsule timing when leaving the capsule during destruct sequence (somehow) * Would be nice to have more sophisticated behavior, e.g., resume the old timing; or drop out the capsule entirely. But how often is this case really going to happen? --- src/p_user.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/p_user.c b/src/p_user.c index 98b35ab4c..7d002561a 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -6147,8 +6147,10 @@ static void P_DoNiGHTSCapsule(player_t *player) } } } - else - player->capsule->lastlook = -1; + else if (player->capsule->lastlook > -1) + // We somehow moved out of the capsule (OBJECTPLACE?) + // So recalculate all the timings + player->capsule->lastlook = player->capsule->extravalue2 = -1; } //