[quake3-commits] r2314 - trunk/code/game

[DONOTREPLY at icculus.org]

Author: ztm
Date: 2012-09-08 18:32:41 -0400 (Sat, 08 Sep 2012)
New Revision: 2314

Modified:
   trunk/code/game/g_session.c
Log:
Don't have g_teamAutoJoin affect bot's team

Bots set their team later, setting it here causes some bots to change team and die later. Can cause extra skulls to be spawn at beginning of harvester (bug #5740).

Modified: trunk/code/game/g_session.c
===================================================================
--- trunk/code/game/g_session.c	2012-09-04 21:13:25 UTC (rev 2313)
+++ trunk/code/game/g_session.c	2012-09-08 22:32:41 UTC (rev 2314)
@@ -107,7 +107,7 @@
 
 	// initial team determination
 	if ( g_gametype.integer >= GT_TEAM ) {
-		if ( g_teamAutoJoin.integer ) {
+		if ( g_teamAutoJoin.integer && !(g_entities[ client - level.clients ].r.svFlags & SVF_BOT) ) {
 			sess->sessionTeam = PickTeam( -1 );
 			BroadcastTeamChange( client, -1 );
 		} else {