From d8f2ff7a4b452ebe30bf5628cb3710284066359b Mon Sep 17 00:00:00 2001 From: Zack Middleton Date: Thu, 29 Jun 2017 16:40:22 -0500 Subject: [PATCH] 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 fc6a3214..1ec4f680 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; }