# HG changeset patch
# User Adam Kaminski <kaminskiadam9@gmail.com>
# Date 1637594796 18000
#      Mon Nov 22 10:26:36 2021 -0500
# Node ID 7b604b9377079c4cfb8b149155b2069f285737c7
# Parent  cc3e661853a93051f3a65c4db74533c98d837aa8
Fixed players not spawning on coop spawns when playing cooperative game modes with teams.

diff -r cc3e661853a9 -r 7b604b937707 src/sv_main.cpp
--- a/src/sv_main.cpp	Mon Nov 22 09:43:13 2021 -0500
+++ b/src/sv_main.cpp	Mon Nov 22 10:26:36 2021 -0500
@@ -6566,8 +6566,10 @@
 
 	if ( GAMEMODE_GetCurrentFlags() & GMF_TEAMGAME )
 		G_TeamgameSpawnPlayer( g_lCurrentClient, players[g_lCurrentClient].Team, true );
+	else if ( GAMEMODE_GetCurrentFlags() & GMF_DEATHMATCH )
+		G_DeathMatchSpawnPlayer( g_lCurrentClient, true );
 	else
-		G_DeathMatchSpawnPlayer( g_lCurrentClient, true );
+		G_CooperativeSpawnPlayer( g_lCurrentClient, true );
 
 	// Tell the join queue that a player "sort of" left the game.
 	JOINQUEUE_PlayerLeftGame( g_lCurrentClient, false );
diff -r cc3e661853a9 -r 7b604b937707 src/team.cpp
--- a/src/team.cpp	Mon Nov 22 09:43:13 2021 -0500
+++ b/src/team.cpp	Mon Nov 22 10:26:36 2021 -0500
@@ -2305,8 +2305,10 @@
 
 		if ( GAMEMODE_GetCurrentFlags() & GMF_TEAMGAME )
 			G_TeamgameSpawnPlayer( consoleplayer, players[consoleplayer].Team, true );
+		else if ( GAMEMODE_GetCurrentFlags() & GMF_DEATHMATCH )
+			G_DeathMatchSpawnPlayer( consoleplayer, true );
 		else
-			G_DeathMatchSpawnPlayer( consoleplayer, true );
+			G_CooperativeSpawnPlayer( consoleplayer, true );
 	}
 }