From 802ddf94b15e6d4b1c5513f0a7cae554357727dd Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Thu, 19 Sep 2019 18:44:55 +0100
Subject: [PATCH] Always pretend cv_playersforexit is 4 in co-op special
stages.
---
src/p_user.c | 5 +++--
src/st_stuff.c | 60 +++++++++++++++++++++++++++-----------------------
2 files changed, 35 insertions(+), 30 deletions(-)
diff --git a/src/p_user.c b/src/p_user.c
index 572cf01fb..0438075f2 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -10989,7 +10989,8 @@ void P_PlayerThink(player_t *player)
if (player->exiting == 2 || countdown2 == 2)
{
- if (cv_playersforexit.value) // Count to be sure everyone's exited
+ UINT8 numneeded = (G_IsSpecialStage(gamemap) ? 4 : cv_playersforexit.value);
+ if (numneeded) // Count to be sure everyone's exited
{
INT32 i, total = 0, exiting = 0;
@@ -11005,7 +11006,7 @@ void P_PlayerThink(player_t *player)
exiting++;
}
- if (!total || ((4*exiting)/total) >= cv_playersforexit.value)
+ if (!total || ((4*exiting)/total) >= numneeded)
{
if (server)
SendNetXCmd(XD_EXITLEVEL, NULL, 0);
diff --git a/src/st_stuff.c b/src/st_stuff.c
index c4f1327c0..20a132b3a 100644
--- a/src/st_stuff.c
+++ b/src/st_stuff.c
@@ -2100,39 +2100,43 @@ static void ST_drawTextHUD(void)
textHUDdraw(M_GetText("\x82""FIRE:""\x80 Enter game"))
}
- if (gametype == GT_COOP && (!stplyr->spectator || (!(maptol & TOL_NIGHTS) && G_IsSpecialStage(gamemap))) && stplyr->exiting && cv_playersforexit.value)
+ if (gametype == GT_COOP && (!stplyr->spectator || (!(maptol & TOL_NIGHTS) && G_IsSpecialStage(gamemap))) && stplyr->exiting)
{
- INT32 i, total = 0, exiting = 0;
-
- for (i = 0; i < MAXPLAYERS; i++)
+ UINT8 numneeded = (G_IsSpecialStage(gamemap) ? 4 : cv_playersforexit.value);
+ if (numneeded)
{
- if (!playeringame[i] || players[i].spectator)
- continue;
- if (players[i].lives <= 0)
- continue;
+ INT32 i, total = 0, exiting = 0;
- total++;
- if (players[i].exiting)
- exiting++;
- }
-
- if (cv_playersforexit.value != 4)
- {
- total *= cv_playersforexit.value;
- if (total & 3)
- total += 4; // round up
- total /= 4;
- }
-
- if (exiting < total)
- {
- if (!splitscreen && !donef12)
+ for (i = 0; i < MAXPLAYERS; i++)
{
- textHUDdraw(M_GetText("\x82""VIEWPOINT:""\x80 Switch view"))
- donef12 = true;
+ if (!playeringame[i] || players[i].spectator)
+ continue;
+ if (players[i].lives <= 0)
+ continue;
+
+ total++;
+ if (players[i].exiting)
+ exiting++;
+ }
+
+ if (numneeded != 4)
+ {
+ total *= cv_playersforexit.value;
+ if (total & 3)
+ total += 4; // round up
+ total /= 4;
+ }
+
+ if (exiting < total)
+ {
+ if (!splitscreen && !donef12)
+ {
+ textHUDdraw(M_GetText("\x82""VIEWPOINT:""\x80 Switch view"))
+ donef12 = true;
+ }
+ total -= exiting;
+ textHUDdraw(va(M_GetText("%d player%s remaining"), total, ((total == 1) ? "" : "s")))
}
- total -= exiting;
- textHUDdraw(va(M_GetText("%d player%s remaining"), total, ((total == 1) ? "" : "s")))
}
}
else if ((gametype == GT_TAG || gametype == GT_HIDEANDSEEK) && (!stplyr->spectator))