summaryrefslogtreecommitdiff
path: root/src/game/g_team.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/g_team.c')
-rw-r--r--src/game/g_team.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/game/g_team.c b/src/game/g_team.c
index debe11f..fb3332b 100644
--- a/src/game/g_team.c
+++ b/src/game/g_team.c
@@ -279,9 +279,9 @@ void G_ChangeTeam( gentity_t *ent, team_t newTeam )
}
- /*
+/*
Call this method to balance teams
- */
+*/
void G_BalanceTeams()
{
team_t sourceTeam;
@@ -540,7 +540,10 @@ void CheckTeamStatus( void )
trap_SendServerCommand( -1, "print \"^5Teams are imbalanced. "
"^5Humans have more players.\n\"");
level.numTeamImbalanceWarnings++;
- G_BalanceTeams();
+ if ( !level.humanTeamLocked &&
+ !level.alienTeamLocked &&
+ g_teamForceBalance.integer == 1)
+ G_BalanceTeams();
}
else if( level.numHumanSpawns > 0 && level.numHumanArmouries > 0 &&
level.numAlienClients - level.numHumanClients >= 2 )
@@ -548,7 +551,10 @@ void CheckTeamStatus( void )
trap_SendServerCommand ( -1, "print \"^5Teams are imbalanced. "
"^5Aliens have more players.\n\"");
level.numTeamImbalanceWarnings++;
- G_BalanceTeams();
+ if ( !level.humanTeamLocked &&
+ !level.alienTeamLocked &&
+ g_teamForceBalance.integer == 1)
+ G_BalanceTeams();
}
else
{