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/ui/ui_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/ui/ui_main.c')
| -rw-r--r-- | src/ui/ui_main.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/ui/ui_main.c b/src/ui/ui_main.c index f148b8c1..83092c72 100644 --- a/src/ui/ui_main.c +++ b/src/ui/ui_main.c @@ -1838,7 +1838,7 @@ static void UI_BuildPlayerList( void ) if( info[0] ) { - BG_ClientListParse( &uiInfo.ignoreList[ uiInfo.playerCount ], + Com_ClientListParse( &uiInfo.ignoreList[ uiInfo.playerCount ], Info_ValueForKey( info, "ig" ) ); Q_strncpyz( uiInfo.rawPlayerNames[uiInfo.playerCount], Info_ValueForKey( info, "n" ), MAX_NAME_LENGTH ); @@ -3277,17 +3277,17 @@ static void UI_RunMenuScript( char **args ) { if( uiInfo.ignoreIndex >= 0 && uiInfo.ignoreIndex < uiInfo.playerCount ) { - if( BG_ClientListTest( &uiInfo.ignoreList[ uiInfo.myPlayerIndex ], + if( Com_ClientListContains( &uiInfo.ignoreList[ uiInfo.myPlayerIndex ], uiInfo.clientNums[ uiInfo.ignoreIndex ] ) ) { - BG_ClientListRemove( &uiInfo.ignoreList[ uiInfo.myPlayerIndex ], + Com_ClientListRemove( &uiInfo.ignoreList[ uiInfo.myPlayerIndex ], uiInfo.clientNums[ uiInfo.ignoreIndex ] ); trap_Cmd_ExecuteText( EXEC_APPEND, va( "unignore %i\n", uiInfo.clientNums[ uiInfo.ignoreIndex ] ) ); } else { - BG_ClientListAdd( &uiInfo.ignoreList[ uiInfo.myPlayerIndex ], + Com_ClientListAdd( &uiInfo.ignoreList[ uiInfo.myPlayerIndex ], uiInfo.clientNums[ uiInfo.ignoreIndex ] ); trap_Cmd_ExecuteText( EXEC_APPEND, va( "ignore %i\n", uiInfo.clientNums[ uiInfo.ignoreIndex ] ) ); @@ -3298,10 +3298,10 @@ static void UI_RunMenuScript( char **args ) { if( uiInfo.ignoreIndex >= 0 && uiInfo.ignoreIndex < uiInfo.playerCount ) { - if( !BG_ClientListTest( &uiInfo.ignoreList[ uiInfo.myPlayerIndex ], + if( !Com_ClientListContains( &uiInfo.ignoreList[ uiInfo.myPlayerIndex ], uiInfo.clientNums[ uiInfo.ignoreIndex ] ) ) { - BG_ClientListAdd( &uiInfo.ignoreList[ uiInfo.myPlayerIndex ], + Com_ClientListAdd( &uiInfo.ignoreList[ uiInfo.myPlayerIndex ], uiInfo.clientNums[ uiInfo.ignoreIndex ] ); trap_Cmd_ExecuteText( EXEC_APPEND, va( "ignore %i\n", uiInfo.clientNums[ uiInfo.ignoreIndex ] ) ); @@ -3312,10 +3312,10 @@ static void UI_RunMenuScript( char **args ) { if( uiInfo.ignoreIndex >= 0 && uiInfo.ignoreIndex < uiInfo.playerCount ) { - if( BG_ClientListTest( &uiInfo.ignoreList[ uiInfo.myPlayerIndex ], + if( Com_ClientListContains( &uiInfo.ignoreList[ uiInfo.myPlayerIndex ], uiInfo.clientNums[ uiInfo.ignoreIndex ] ) ) { - BG_ClientListRemove( &uiInfo.ignoreList[ uiInfo.myPlayerIndex ], + Com_ClientListRemove( &uiInfo.ignoreList[ uiInfo.myPlayerIndex ], uiInfo.clientNums[ uiInfo.ignoreIndex ] ); trap_Cmd_ExecuteText( EXEC_APPEND, va( "unignore %i\n", uiInfo.clientNums[ uiInfo.ignoreIndex ] ) ); @@ -3539,12 +3539,12 @@ static const char *UI_FeederItemText( float feederID, int index, int column, qha { case 1: // am I ignoring him - return ( BG_ClientListTest( &uiInfo.ignoreList[ uiInfo.myPlayerIndex ], + return ( Com_ClientListContains( &uiInfo.ignoreList[ uiInfo.myPlayerIndex ], uiInfo.clientNums[ index ] ) ) ? "X" : ""; case 2: // is he ignoring me - return ( BG_ClientListTest( &uiInfo.ignoreList[ index ], + return ( Com_ClientListContains( &uiInfo.ignoreList[ index ], uiInfo.playerNumber ) ) ? "X" : ""; default: |