diff options
| author | Tony J. White <tjw@tjw.org> | 2007-03-03 03:11:49 +0000 |
|---|---|---|
| committer | Tony J. White <tjw@tjw.org> | 2007-03-03 03:11:49 +0000 |
| commit | 04d4cd2981788a7551d2b00fd89abe625b86e324 (patch) | |
| tree | 918f1e81ab4c1c4545f2af319afd8368907af29e | |
| parent | 2ed4fa4812f961d203fdfde80629238177cb236c (diff) | |
* (bug 2971) improved g_teamForceBalance checking (M. Kristall)
| -rw-r--r-- | src/game/g_cmds.c | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c index 5ae5320f..c5a115d0 100644 --- a/src/game/g_cmds.c +++ b/src/game/g_cmds.c @@ -649,18 +649,27 @@ Cmd_Team_f void Cmd_Team_f( gentity_t *ent ) { pTeam_t team; + pTeam_t oldteam = ent->client->pers.teamSelection; char s[ MAX_TOKEN_CHARS ]; qboolean force = G_admin_permission(ent, ADMF_FORCETEAMCHANGE); + int aliens = level.numAlienClients; + int humans = level.numHumanClients; // stop team join spam if( level.time - ent->client->pers.teamChangeTime < 1000 ) return; + if( oldteam == PTE_ALIENS ) + aliens--; + else if( oldteam == PTE_HUMANS ) + humans--; + trap_Argv( 1, s, sizeof( s ) ); if( !strlen( s ) ) { - trap_SendServerCommand( ent-g_entities, va("print \"team: %i\n\"", ent->client->pers.teamSelection ) ); + trap_SendServerCommand( ent-g_entities, va("print \"team: %i\n\"", + oldteam ) ); return; } @@ -681,10 +690,7 @@ void Cmd_Team_f( gentity_t *ent ) force = qtrue; } - if( !force && g_teamForceBalance.integer - && ( ( level.numAlienClients > level.numHumanClients ) || - ( ent->client->ps.stats[ STAT_PTEAM ] == PTE_HUMANS && - level.numAlienClients >= level.numHumanClients ) ) ) + if( !force && g_teamForceBalance.integer && aliens > humans ) { G_TriggerMenu( ent - g_entities, MN_A_TEAMFULL ); return; @@ -707,10 +713,7 @@ void Cmd_Team_f( gentity_t *ent ) force = qtrue; } - if( !force && g_teamForceBalance.integer && - ( ( level.numHumanClients > level.numAlienClients ) || - ( ent->client->ps.stats[ STAT_PTEAM ] == PTE_ALIENS && - level.numHumanClients >= level.numAlienClients ) ) ) + if( !force && g_teamForceBalance.integer && humans > aliens ) { G_TriggerMenu( ent - g_entities, MN_H_TEAMFULL ); return; @@ -741,11 +744,11 @@ void Cmd_Team_f( gentity_t *ent ) } // stop team join spam - if( ent->client->pers.teamSelection == team ) + if( oldteam == team ) return; //guard against build timer exploit - if( ent->client->pers.teamSelection != PTE_NONE && + if( oldteam != PTE_NONE && ( ent->client->ps.stats[ STAT_PCLASS ] == PCL_ALIEN_BUILDER0 || ent->client->ps.stats[ STAT_PCLASS ] == PCL_ALIEN_BUILDER0_UPG || BG_InventoryContainsWeapon( WP_HBUILD, ent->client->ps.stats ) || |