From 7bceef7862291e5e267331c38143e48aee300f00 Mon Sep 17 00:00:00 2001
From: Richard Allen <ra@ra.is>
Date: Tue, 20 Aug 2002 20:07:21 +0000
Subject: [PATCH] Fixed the bot_minplayer system.

---
 reaction/ChangeLog    |  1 +
 reaction/game/g_bot.c | 19 +++++++++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/reaction/ChangeLog b/reaction/ChangeLog
index 383c4733..9594d144 100644
--- a/reaction/ChangeLog
+++ b/reaction/ChangeLog
@@ -36,6 +36,7 @@
 * % vars are now only expanded for say_team messages.
 * Hitboxes now 100% AQ style
 * Removed cockingsounds from all weapons except the mk23, m4 and mp5
+* Fixed the bot_minplayer system.
 
 
 # List fixes here for the 2.1 release
diff --git a/reaction/game/g_bot.c b/reaction/game/g_bot.c
index 47a0b35a..cda97e85 100644
--- a/reaction/game/g_bot.c
+++ b/reaction/game/g_bot.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.14  2002/08/20 20:07:21  jbravo
+// Fixed the bot_minplayer system.
+//
 // Revision 1.13  2002/06/16 20:06:14  jbravo
 // Reindented all the source files with "indent -kr -ut -i8 -l120 -lc120 -sob -bad -bap"
 //
@@ -368,8 +371,12 @@ int G_CountHumanPlayers(int team)
 		if (g_entities[cl->ps.clientNum].r.svFlags & SVF_BOT) {
 			continue;
 		}
-		if (team >= 0 && cl->sess.sessionTeam != team) {
-			continue;
+		if (g_gametype.integer >= GT_TEAM) {
+			if (team >= 0 && cl->sess.savedTeam != team) 
+				continue;
+		} else {
+			if (team >= 0 && cl->sess.sessionTeam != team) 
+				continue;
 		}
 		num++;
 	}
@@ -395,8 +402,12 @@ int G_CountBotPlayers(int team)
 		if (!(g_entities[cl->ps.clientNum].r.svFlags & SVF_BOT)) {
 			continue;
 		}
-		if (team >= 0 && cl->sess.sessionTeam != team) {
-			continue;
+		if (g_gametype.integer >= GT_TEAM) {
+			if (team >= 0 && cl->sess.savedTeam != team)
+				continue;
+		} else {
+			if (team >= 0 && cl->sess.sessionTeam != team)
+				continue;
 		}
 		num++;
 	}