diff options
| author | Paweł Redman <pawel.redman@gmail.com> | 2015-03-13 18:54:39 +0100 |
|---|---|---|
| committer | Paweł Redman <pawel.redman@gmail.com> | 2015-03-13 18:54:39 +0100 |
| commit | 24c68838af08ee3e2007d5e7c89b6ccd4aa55f6f (patch) | |
| tree | bc5d04103a925945829623b131945031d9a43318 /src | |
| parent | 981c3c348ce6e68dfdbfac7e24b9e1fab2963374 (diff) | |
| parent | fa2349cabfa5849bfc7c19d76f3a50d26b6c3709 (diff) | |
Merge branch 'master' of http://github.com/mtiusane/new-edge
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/g_cmds.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c index 486024f..c17ec99 100644 --- a/src/game/g_cmds.c +++ b/src/game/g_cmds.c @@ -935,11 +935,15 @@ static qboolean G_SayTo( gentity_t *ent, gentity_t *other, saymode_t mode, const return qfalse; if( !other->client ) - return qfalse; + return qfalse; if( other->client->pers.connected != CON_CONNECTED ) return qfalse; + // ignore messages from people in /ignore list + 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 ) ) { |