diff options
| author | Tim Angus <tim@ngus.net> | 2009-10-09 22:24:05 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:16:45 +0000 |
| commit | a1f3d889f1eca9b3a670363dd386480ec2b48a76 (patch) | |
| tree | 80452d051386e4ca98efed6d2cd6f762416b46e7 /src/cgame/cg_main.c | |
| parent | d28ad7411a91881d168d45d0846adf80a579a02f (diff) | |
* (bug #3836) Add [SV|trap]_SetConfigstringRestrictions which prevents some
clients receiving a config string
* Move BG_ClientList* to Com_ClientList*
* Split CS_STAGES into CS_ALIEN_STAGES and CS_HUMAN_STAGES
Diffstat (limited to 'src/cgame/cg_main.c')
| -rw-r--r-- | src/cgame/cg_main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c index 01c24579..e0a9e83c 100644 --- a/src/cgame/cg_main.c +++ b/src/cgame/cg_main.c @@ -1430,9 +1430,9 @@ static qboolean CG_ClientIsReady( int clientNum ) { clientList_t ready; - BG_ClientListParse( &ready, CG_ConfigString( CS_CLIENTS_READY ) ); + Com_ClientListParse( &ready, CG_ConfigString( CS_CLIENTS_READY ) ); - return BG_ClientListTest( &ready, clientNum ); + return Com_ClientListContains( &ready, clientNum ); } static const char *CG_FeederItemText( float feederID, int index, int column, qhandle_t *handle ) @@ -1761,13 +1761,13 @@ void CG_Init( int serverMessageNum, int serverCommandSequence, int clientNum ) // get the gamestate from the client system trap_GetGameState( &cgs.gameState ); - // copy vote display strings so they don't show up blank if we see + // copy vote display strings so they don't show up blank if we see // the same one directly after connecting Q_strncpyz( cgs.voteString[ TEAM_NONE ], - CG_ConfigString( CS_VOTE_STRING + TEAM_NONE ), + CG_ConfigString( CS_VOTE_STRING + TEAM_NONE ), sizeof( cgs.voteString ) ); Q_strncpyz( cgs.voteString[ TEAM_ALIENS ], - CG_ConfigString( CS_VOTE_STRING + TEAM_ALIENS ), + CG_ConfigString( CS_VOTE_STRING + TEAM_ALIENS ), sizeof( cgs.voteString[ TEAM_ALIENS ] ) ); Q_strncpyz( cgs.voteString[ TEAM_HUMANS ], CG_ConfigString( CS_VOTE_STRING + TEAM_ALIENS ), |