diff options
| author | Mikko Tiusanen <ams@daug.net> | 2014-07-06 17:56:57 +0300 |
|---|---|---|
| committer | Mikko Tiusanen <ams@daug.net> | 2014-07-06 17:56:57 +0300 |
| commit | 0afc9cdcc596eb0ad9b6630b95b2e55df7337030 (patch) | |
| tree | 53a9f94836de9f697416fdedd06b0efc489e387c /src/game/g_team.c | |
| parent | 595fbed7d45e2c1434217ae3a8f86510a56d79b9 (diff) | |
Fixed auto g_teamForceBalance = 2 handling.
Fixed colors in certain commands.
Correct message now displayed in slap.
Diffstat (limited to 'src/game/g_team.c')
| -rw-r--r-- | src/game/g_team.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/game/g_team.c b/src/game/g_team.c index fb3332b..e8a79db 100644 --- a/src/game/g_team.c +++ b/src/game/g_team.c @@ -528,7 +528,9 @@ void CheckTeamStatus( void ) } // Warn on imbalanced teams - if( g_teamImbalanceWarnings.integer && !level.intermissiontime && + if( !level.humanTeamLocked && !level.alienTeamLocked && + g_teamForceBalance.integer == 1 && + g_teamImbalanceWarnings.integer && !level.intermissiontime && ( level.time - level.lastTeamImbalancedTime > ( g_teamImbalanceWarnings.integer * 1000 ) ) && level.numTeamImbalanceWarnings < 3 && !level.restarted ) @@ -540,10 +542,7 @@ void CheckTeamStatus( void ) trap_SendServerCommand( -1, "print \"^5Teams are imbalanced. " "^5Humans have more players.\n\""); level.numTeamImbalanceWarnings++; - if ( !level.humanTeamLocked && - !level.alienTeamLocked && - g_teamForceBalance.integer == 1) - G_BalanceTeams(); + G_BalanceTeams(); } else if( level.numHumanSpawns > 0 && level.numHumanArmouries > 0 && level.numAlienClients - level.numHumanClients >= 2 ) @@ -551,9 +550,6 @@ void CheckTeamStatus( void ) trap_SendServerCommand ( -1, "print \"^5Teams are imbalanced. " "^5Aliens have more players.\n\""); level.numTeamImbalanceWarnings++; - if ( !level.humanTeamLocked && - !level.alienTeamLocked && - g_teamForceBalance.integer == 1) G_BalanceTeams(); } else |