r2492 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2007-05-05 07:01:25 -0400 (Sat, 05 May 2007)
New Revision: 2492

Modified:
   trunk/data/qcsrc/server/bots.qc
Log:
make minplayers ignore spectators


Modified: trunk/data/qcsrc/server/bots.qc
===================================================================
--- trunk/data/qcsrc/server/bots.qc	2007-05-05 10:25:30 UTC (rev 2491)
+++ trunk/data/qcsrc/server/bots.qc	2007-05-05 11:01:25 UTC (rev 2492)
@@ -2021,7 +2021,8 @@
 float botframe_nextthink;
 void() bot_serverframe =
 {
-	float realplayers, bots;
+	float realplayers, bots, activerealplayers;
+	entity head;
 
 	if (intermission_running)
 		return;
@@ -2029,8 +2030,16 @@
 	if (time < 2)
 		return;
 
-	realplayers = player_count - currentbots;
+	activerealplayers = 0;
+	realplayers = 0;
 
+	FOR_EACH_REALCLIENT(head)
+	{
+		if(head.classname == "player")
+			++activerealplayers;
+		++realplayers;
+	}
+
 	// add/remove bots if needed to make sure there are at least
 	// minplayers+bot_number, or remove all bots if no one is playing
 	// But don't remove bots immediately on level change, as the real players
@@ -2045,7 +2054,7 @@
 		realminbots = cvar("bot_number");
 		minbots = max(0, floor(realminbots));
 
-		bots = min(max(minbots, minplayers - realplayers), maxclients - realplayers);
+		bots = min(max(minbots, minplayers - activerealplayers), maxclients - realplayers);
 	}
 	else
 	{