From d17399bccec5848a5e852fecc589ec41a9768d89 Mon Sep 17 00:00:00 2001 From: toaster Date: Mon, 26 Jun 2023 20:23:29 +0100 Subject: [PATCH] Revert "Quicker, almost instantaneous Sealed Star conclusion after death" This reverts commit 32eead29e5587d5cfb4cf69a3ae4d8d9089c8cbe. --- src/p_user.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/p_user.c b/src/p_user.c index 890f087d8..ed8c06116 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -1436,7 +1436,7 @@ void P_DoPlayerExit(player_t *player, pflags_t flags) { if (specialout == true) { - exitcountdown = 2; + exitcountdown = TICRATE; } else { @@ -1498,8 +1498,7 @@ void P_DoAllPlayersExit(pflags_t flags, boolean trygivelife) { UINT8 i; boolean givenlife = false; - boolean dofinishsound = (musiccountdown == 0); - boolean specialout = specialstageinfo.valid; + const boolean dofinishsound = (musiccountdown == 0); for (i = 0; i < MAXPLAYERS; i++) { @@ -1514,11 +1513,6 @@ void P_DoAllPlayersExit(pflags_t flags, boolean trygivelife) P_DoPlayerExit(&players[i], flags); - if (specialout && K_IsPlayerLosing(&players[i]) == false) - { - specialout = false; - } - if (trygivelife == false) { continue; @@ -1528,7 +1522,7 @@ void P_DoAllPlayersExit(pflags_t flags, boolean trygivelife) givenlife = true; } - if (!dofinishsound || specialout) + if (!dofinishsound) { // You've already finished, don't play again ;