[ioquake3] 15/50: Check delayed bot's team when counting bots for bot_minplayers

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository ioquake3.

commit d8f2ff7a4b452ebe30bf5628cb3710284066359b
Author: Zack Middleton <zack at cloemail.com>
Date:   Thu Jun 29 16:40:22 2017 -0500

    Check delayed bot's team when counting bots for bot_minplayers
    
    note: This requires my previous commit that added teampref userinfo
    so that bots choose correct team in ClientConnect.
---
 code/game/g_bot.c | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/code/game/g_bot.c b/code/game/g_bot.c
index fc6a321..1ec4f68 100644
--- a/code/game/g_bot.c
+++ b/code/game/g_bot.c
@@ -387,16 +387,18 @@ int G_CountHumanPlayers( int team ) {
 /*
 ===============
 G_CountBotPlayers
+
+Check connected and connecting (delay join) bots.
 ===============
 */
 int G_CountBotPlayers( int team ) {
-	int i, n, num;
+	int i, num;
 	gclient_t	*cl;
 
 	num = 0;
 	for ( i=0 ; i< g_maxclients.integer ; i++ ) {
 		cl = level.clients + i;
-		if ( cl->pers.connected != CON_CONNECTED ) {
+		if ( cl->pers.connected == CON_DISCONNECTED ) {
 			continue;
 		}
 		if ( !(g_entities[i].r.svFlags & SVF_BOT) ) {
@@ -407,15 +409,6 @@ int G_CountBotPlayers( int team ) {
 		}
 		num++;
 	}
-	for( n = 0; n < BOT_SPAWN_QUEUE_DEPTH; n++ ) {
-		if( !botSpawnQueue[n].spawnTime ) {
-			continue;
-		}
-		if ( botSpawnQueue[n].spawnTime > level.time ) {
-			continue;
-		}
-		num++;
-	}
 	return num;
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ioquake3.git