diff options
Diffstat (limited to 'src/cgame')
| -rw-r--r-- | src/cgame/cg_local.h | 1 | ||||
| -rw-r--r-- | src/cgame/cg_players.c | 7 | ||||
| -rw-r--r-- | src/cgame/cg_servercmds.c | 37 |
3 files changed, 12 insertions, 33 deletions
diff --git a/src/cgame/cg_local.h b/src/cgame/cg_local.h index b3d6e85..dc289b9 100644 --- a/src/cgame/cg_local.h +++ b/src/cgame/cg_local.h @@ -1456,7 +1456,6 @@ typedef struct cgMedia_t media; voice_t *voices; - clientList_t ignoreList; int alienBuildPool; int alienBuildPoolMax; diff --git a/src/cgame/cg_players.c b/src/cgame/cg_players.c index 32f3fb8..29f6992 100644 --- a/src/cgame/cg_players.c +++ b/src/cgame/cg_players.c @@ -757,13 +757,6 @@ void CG_NewClientInfo( int clientNum ) // the old value memset( &newInfo, 0, sizeof( newInfo ) ); - - // grab our own ignoreList - if( clientNum == cg.predictedPlayerState.clientNum ) - { - v = Info_ValueForKey( configstring, "ig" ); - Com_ClientListParse( &cgs.ignoreList, v ); - } // isolate the player's name v = Info_ValueForKey( configstring, "n" ); diff --git a/src/cgame/cg_servercmds.c b/src/cgame/cg_servercmds.c index a373e5a..7326ba8 100644 --- a/src/cgame/cg_servercmds.c +++ b/src/cgame/cg_servercmds.c @@ -948,7 +948,6 @@ static void CG_Say( int clientNum, saymode_t mode, const char *text ) { char *name; char prefix[ 11 ] = ""; - char *ignore = ""; char *location = ""; char *color; char *maybeColon; @@ -969,9 +968,6 @@ static void CG_Say( int clientNum, saymode_t mode, const char *text ) Com_sprintf( prefix, sizeof( prefix ), "[%s%c" S_COLOR_WHITE "] ", tcolor, toupper( *( BG_TeamName( ci->team ) ) ) ); - if( Com_ClientListContains( &cgs.ignoreList, clientNum ) ) - ignore = "[skipnotify]"; - if( ( mode == SAY_TEAM || mode == SAY_AREA ) && cg.snap->ps.pm_type != PM_INTERMISSION ) { @@ -1016,37 +1012,32 @@ static void CG_Say( int clientNum, saymode_t mode, const char *text ) switch( mode ) { case SAY_ALL: - // might already be ignored but in that case no harm is done - if( cg_teamChatsOnly.integer ) - ignore = "[skipnotify]"; - - CG_Printf( "%s%s%s" S_COLOR_WHITE "%s %c" S_COLOR_GREEN "%s\n", - ignore, prefix, name, maybeColon, INDENT_MARKER, text ); + CG_Printf( "%s%s" S_COLOR_WHITE "%s %c" S_COLOR_GREEN "%s\n", + prefix, name, maybeColon, INDENT_MARKER, text ); break; case SAY_TEAM: - CG_Printf( "%s%s(%s" S_COLOR_WHITE ")%s%s %c" S_COLOR_CYAN "%s\n", - ignore, prefix, name, location, maybeColon, INDENT_MARKER, text ); + CG_Printf( "%s(%s" S_COLOR_WHITE ")%s%s %c" S_COLOR_CYAN "%s\n", + prefix, name, location, maybeColon, INDENT_MARKER, text ); break; case SAY_ADMINS: case SAY_ADMINS_PUBLIC: - CG_Printf( "%s%s%s%s" S_COLOR_WHITE "%s %c" S_COLOR_MAGENTA "%s\n", - ignore, prefix, + CG_Printf( "%s%s%s" S_COLOR_WHITE "%s %c" S_COLOR_MAGENTA "%s\n", + prefix, ( mode == SAY_ADMINS ) ? "[ADMIN]" : "[PLAYER]", name, maybeColon, INDENT_MARKER, text ); break; case SAY_AREA: - CG_Printf( "%s%s<%s" S_COLOR_WHITE ">%s%s %c" S_COLOR_BLUE "%s\n", - ignore, prefix, name, location, maybeColon, INDENT_MARKER, text ); + CG_Printf( "%s<%s" S_COLOR_WHITE ">%s%s %c" S_COLOR_BLUE "%s\n", + prefix, name, location, maybeColon, INDENT_MARKER, text ); break; case SAY_PRIVMSG: case SAY_TPRIVMSG: color = ( mode == SAY_TPRIVMSG ) ? S_COLOR_CYAN : S_COLOR_GREEN; - CG_Printf( "%s%s[%s" S_COLOR_WHITE " -> %s" S_COLOR_WHITE "]%s %c%s%s\n", - ignore, prefix, name, cgs.clientinfo[ cg.clientNum ].name, + CG_Printf( "%s[%s" S_COLOR_WHITE " -> %s" S_COLOR_WHITE "]%s %c%s%s\n", + prefix, name, cgs.clientinfo[ cg.clientNum ].name, maybeColon, INDENT_MARKER, color, text ); - if( !ignore[0] ) - CG_CenterPrint( va( "%sPrivate message from: " S_COLOR_WHITE "%s", - color, name ), 200, GIANTCHAR_WIDTH * 4 ); + CG_CenterPrint( va( "%sPrivate message from: " S_COLOR_WHITE "%s", + color, name ), 200, GIANTCHAR_WIDTH * 4 ); break; case SAY_RAW: CG_Printf( "%s\n", text ); @@ -1191,10 +1182,6 @@ static void CG_ParseVoice( void ) if( !track ) return; - // don't play audio track for lamers - if( Com_ClientListContains( &cgs.ignoreList, clientNum ) ) - return; - switch( vChan ) { case VOICE_CHAN_ALL: |