diff options
| author | Christopher Schwarz <lakitu7@gmail.com> | 2009-10-21 23:16:46 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:16:59 +0000 |
| commit | 4644c1e65a337db1a94208162465908e1e56a0d6 (patch) | |
| tree | aa014b484cacb1c20e1505647b667516af21f386 /src | |
| parent | aa7a0ecd771b337400b7a7f34ff5c64f678757ea (diff) | |
* Don't show locations in teamchats during intermission
* Fix /destroy (devmap only) to work on marked buildables without having to use it twice
Diffstat (limited to 'src')
| -rw-r--r-- | src/cgame/cg_servercmds.c | 3 | ||||
| -rw-r--r-- | src/game/g_cmds.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/cgame/cg_servercmds.c b/src/cgame/cg_servercmds.c index 0b562360..9af97006 100644 --- a/src/cgame/cg_servercmds.c +++ b/src/cgame/cg_servercmds.c @@ -940,7 +940,8 @@ static void CG_Say( int clientNum, saymode_t mode, const char *text ) Com_sprintf( prefix, sizeof( prefix ), "[^%c%c" S_COLOR_WHITE "] " S_COLOR_WHITE, tcolor, toupper( *( BG_TeamName( ci->team ) ) ) ); - if( ci && ( mode == SAY_TEAM || mode == SAY_AREA ) ) + if( ci && ( mode == SAY_TEAM || mode == SAY_AREA ) + && cg.snap->ps.pm_type != PM_INTERMISSION ) { if( clientNum == cg.snap->ps.clientNum ) { diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c index 4ad07392..e67fcced 100644 --- a/src/game/g_cmds.c +++ b/src/game/g_cmds.c @@ -1682,7 +1682,7 @@ void Cmd_Destroy_f( gentity_t *ent ) } // Cancel deconstruction - if( g_markDeconstruct.integer && traceEnt->deconstruct ) + if( deconstruct && g_markDeconstruct.integer && traceEnt->deconstruct ) { traceEnt->deconstruct = qfalse; return; |