From 7768e2c7f9ff46fcd82bf7bbd3e270fec34b29d2 Mon Sep 17 00:00:00 2001
From: Jaime Passos <lazymyuutsu@gmail.com>
Date: Wed, 18 Dec 2019 15:14:24 -0300
Subject: [PATCH] More spectator tweaks

---
 src/p_mobj.c   |  6 +++++-
 src/st_stuff.c | 36 +++++++++++++++++++-----------------
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/src/p_mobj.c b/src/p_mobj.c
index 1913ef91f..12409a18a 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -11249,8 +11249,12 @@ void P_SpawnPlayer(INT32 playernum)
 	else
 	{
 		p->outofcoop = false;
+		p->spectator = false;
 		if (netgame && p->jointime < 1)
-			p->spectator = true;
+		{
+			// Averted by GTR_NOSPECTATORSPAWN.
+			p->spectator = (gametyperules & GTR_NOSPECTATORSPAWN) ? false : true;
+		}
 		else if (multiplayer && !netgame)
 		{
 			// If you're in a team game and you don't have a team assigned yet...
diff --git a/src/st_stuff.c b/src/st_stuff.c
index 54bd36ac0..1c9b4614e 100644
--- a/src/st_stuff.c
+++ b/src/st_stuff.c
@@ -2205,31 +2205,33 @@ static void ST_drawTextHUD(void)
 			textHUDdraw(M_GetText("\x82""Wait for the stage to end..."))
 		else if (G_PlatformGametype())
 		{
-			if (gametype == GT_COOP
-			&& stplyr->lives <= 0
-			&& cv_cooplives.value == 2
-			&& (netgame || multiplayer))
+			if (gametype == GT_COOP)
 			{
-				INT32 i;
-				for (i = 0; i < MAXPLAYERS; i++)
+				if (stplyr->lives <= 0
+				&& cv_cooplives.value == 2
+				&& (netgame || multiplayer))
 				{
-					if (!playeringame[i])
-						continue;
+					INT32 i;
+					for (i = 0; i < MAXPLAYERS; i++)
+					{
+						if (!playeringame[i])
+							continue;
 
-					if (&players[i] == stplyr)
-						continue;
+						if (&players[i] == stplyr)
+							continue;
 
-					if (players[i].lives > 1)
-						break;
-					}
+						if (players[i].lives > 1)
+							break;
+						}
 
-				if (i != MAXPLAYERS)
-					textHUDdraw(M_GetText("You'll steal a life on respawn..."))
+					if (i != MAXPLAYERS)
+						textHUDdraw(M_GetText("You'll steal a life on respawn..."))
+					else
+						textHUDdraw(M_GetText("Wait to respawn..."))
+				}
 				else
 					textHUDdraw(M_GetText("Wait to respawn..."))
 			}
-			else
-				textHUDdraw(M_GetText("Wait to respawn..."))
 		}
 		else if (G_GametypeHasSpectators())
 			textHUDdraw(M_GetText("\x82""FIRE:""\x80 Enter game"))