From 32eead29e5587d5cfb4cf69a3ae4d8d9089c8cbe Mon Sep 17 00:00:00 2001 From: toaster Date: Mon, 26 Jun 2023 14:23:38 +0100 Subject: [PATCH] Quicker, almost instantaneous Sealed Star conclusion after death Also gets rid of the "wuu wuu wuu" sound from Competition that plays in this instance --- src/p_user.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/p_user.c b/src/p_user.c index ed8c06116..890f087d8 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 = TICRATE; + exitcountdown = 2; } else { @@ -1498,7 +1498,8 @@ void P_DoAllPlayersExit(pflags_t flags, boolean trygivelife) { UINT8 i; boolean givenlife = false; - const boolean dofinishsound = (musiccountdown == 0); + boolean dofinishsound = (musiccountdown == 0); + boolean specialout = specialstageinfo.valid; for (i = 0; i < MAXPLAYERS; i++) { @@ -1513,6 +1514,11 @@ 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; @@ -1522,7 +1528,7 @@ void P_DoAllPlayersExit(pflags_t flags, boolean trygivelife) givenlife = true; } - if (!dofinishsound) + if (!dofinishsound || specialout) { // You've already finished, don't play again ;