summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/cgame/cg_local.h1
-rw-r--r--src/cgame/cg_players.c7
-rw-r--r--src/cgame/cg_servercmds.c7
-rw-r--r--src/game/g_cmds.c3
4 files changed, 3 insertions, 15 deletions
diff --git a/src/cgame/cg_local.h b/src/cgame/cg_local.h
index e759eaba..404351f5 100644
--- a/src/cgame/cg_local.h
+++ b/src/cgame/cg_local.h
@@ -1403,7 +1403,6 @@ typedef struct
cgMedia_t media;
voice_t *voices;
- clientList_t ignoreList;
} cgs_t;
typedef struct
diff --git a/src/cgame/cg_players.c b/src/cgame/cg_players.c
index c882dd37..0060d661 100644
--- a/src/cgame/cg_players.c
+++ b/src/cgame/cg_players.c
@@ -746,13 +746,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" );
Q_strncpyz( newInfo.name, v, sizeof( newInfo.name ) );
diff --git a/src/cgame/cg_servercmds.c b/src/cgame/cg_servercmds.c
index 5e2c20da..fec4cfae 100644
--- a/src/cgame/cg_servercmds.c
+++ b/src/cgame/cg_servercmds.c
@@ -896,9 +896,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 )
{
@@ -1120,10 +1117,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:
diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c
index 1a3413a1..6ab2ae15 100644
--- a/src/game/g_cmds.c
+++ b/src/game/g_cmds.c
@@ -859,6 +859,9 @@ static qboolean G_SayTo( gentity_t *ent, gentity_t *other, saymode_t mode, const
if( other->client->pers.connected != CON_CONNECTED )
return qfalse;
+ if( Com_ClientListContains( &other->client->sess.ignoreList, (int)( ent - g_entities ) ) )
+ return qfalse;
+
if( ( ent && !OnSameTeam( ent, other ) ) &&
( mode == SAY_TEAM || mode == SAY_AREA || mode == SAY_TPRIVMSG ) )
{