Fixed the bot_minplayer system.

This commit is contained in:
Richard Allen 2002-08-20 20:07:21 +00:00
parent 66aa9e44d6
commit 7bceef7862
2 changed files with 16 additions and 4 deletions

View file

@ -36,6 +36,7 @@
* % vars are now only expanded for say_team messages. * % vars are now only expanded for say_team messages.
* Hitboxes now 100% AQ style * Hitboxes now 100% AQ style
* Removed cockingsounds from all weapons except the mk23, m4 and mp5 * Removed cockingsounds from all weapons except the mk23, m4 and mp5
* Fixed the bot_minplayer system.
# List fixes here for the 2.1 release # List fixes here for the 2.1 release

View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $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 // 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" // 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) { if (g_entities[cl->ps.clientNum].r.svFlags & SVF_BOT) {
continue; continue;
} }
if (team >= 0 && cl->sess.sessionTeam != team) { if (g_gametype.integer >= GT_TEAM) {
continue; if (team >= 0 && cl->sess.savedTeam != team)
continue;
} else {
if (team >= 0 && cl->sess.sessionTeam != team)
continue;
} }
num++; num++;
} }
@ -395,8 +402,12 @@ int G_CountBotPlayers(int team)
if (!(g_entities[cl->ps.clientNum].r.svFlags & SVF_BOT)) { if (!(g_entities[cl->ps.clientNum].r.svFlags & SVF_BOT)) {
continue; continue;
} }
if (team >= 0 && cl->sess.sessionTeam != team) { if (g_gametype.integer >= GT_TEAM) {
continue; if (team >= 0 && cl->sess.savedTeam != team)
continue;
} else {
if (team >= 0 && cl->sess.sessionTeam != team)
continue;
} }
num++; num++;
} }