Fixed bug with team autoselection bypassing forcespec

This commit is contained in:
Paradox460 committed 2008-01-06 23:30:17 +00:00
1 parent 1c6bd56fb2
commit 6899a955a6
1 file changed
+7 -9
+7 -9
View File
@@ -883,7 +883,13 @@ void Cmd_Team_f( gentity_t *ent )
}
else if( !Q_stricmp( s, "auto" ) )
{
if( level.humanTeamLocked && level.alienTeamLocked )
if ( ent->client->pers.specd )
{
trap_SendServerCommand( ent-g_entities, va( "print \"you cannot join teams\n\"" ) );
return;
}
else if( level.humanTeamLocked && level.alienTeamLocked )
team = PTE_NONE;
else if( humans > aliens )
team = PTE_ALIENS;
@@ -4094,15 +4100,7 @@ void ClientCommand( int clientNum )
// do tests here to reduce the amount of repeated code
if( !( cmds[ i ].cmdFlags & CMD_INTERMISSION ) && ( level.intermissiontime || level.paused ) )
{
if ( level.paused &&
cmds[ i ].cmdHandler == Cmd_Team_f )
{
trap_SendServerCommand( clientNum,
"print \"Teams are locked when the game is paused\n\"" );
}
return;
}
if( cmds[ i ].cmdFlags & CMD_CHEAT && !g_cheats.integer )
{