diff options
Diffstat (limited to 'src/cgame/cg_servercmds.c')
| -rw-r--r-- | src/cgame/cg_servercmds.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/cgame/cg_servercmds.c b/src/cgame/cg_servercmds.c index 2665df16..6fcae7eb 100644 --- a/src/cgame/cg_servercmds.c +++ b/src/cgame/cg_servercmds.c @@ -377,8 +377,9 @@ static void CG_ConfigStringModified( void ) CG_NewClientInfo( num - CS_PLAYERS ); CG_BuildSpectatorString( ); } - else if( num == CS_FLAGSTATUS ) + else if( num == CS_WINNER ) { + trap_Cvar_Set( "ui_winner", str ); } else if( num == CS_SHADERSTATE ) { @@ -806,8 +807,9 @@ static void CG_ServerCommand( void ) { if( !cg_teamChatsOnly.integer ) { - trap_S_StartLocalSound( cgs.media.talkSound, CHAN_LOCAL_SOUND ); Q_strncpyz( text, CG_Argv( 1 ), MAX_SAY_TEXT ); + if( Q_stricmpn( text, "[skipnotify]", 12 ) ) + trap_S_StartLocalSound( cgs.media.talkSound, CHAN_LOCAL_SOUND ); CG_RemoveChatEscapeChar( text ); CG_Printf( "%s\n", text ); } @@ -817,14 +819,16 @@ static void CG_ServerCommand( void ) if( !strcmp( cmd, "tchat" ) ) { - if( cg.snap->ps.stats[ STAT_PTEAM ] == PTE_ALIENS ) - trap_S_StartLocalSound( cgs.media.alienTalkSound, CHAN_LOCAL_SOUND ); - else if( cg.snap->ps.stats[ STAT_PTEAM ] == PTE_HUMANS ) - trap_S_StartLocalSound( cgs.media.humanTalkSound, CHAN_LOCAL_SOUND ); - else - trap_S_StartLocalSound( cgs.media.talkSound, CHAN_LOCAL_SOUND ); - Q_strncpyz( text, CG_Argv( 1 ), MAX_SAY_TEXT ); + if( Q_stricmpn( text, "[skipnotify]", 12 ) ) + { + if( cg.snap->ps.stats[ STAT_PTEAM ] == PTE_ALIENS ) + trap_S_StartLocalSound( cgs.media.alienTalkSound, CHAN_LOCAL_SOUND ); + else if( cg.snap->ps.stats[ STAT_PTEAM ] == PTE_HUMANS ) + trap_S_StartLocalSound( cgs.media.humanTalkSound, CHAN_LOCAL_SOUND ); + else + trap_S_StartLocalSound( cgs.media.talkSound, CHAN_LOCAL_SOUND ); + } CG_RemoveChatEscapeChar( text ); CG_Printf( "%s\n", text ); return; |