summaryrefslogtreecommitdiff
path: root/src/cgame
diff options
context:
space:
mode:
authorTim Angus <tim@ngus.net>2005-06-29 23:35:55 +0000
committerTim Angus <tim@ngus.net>2005-06-29 23:35:55 +0000
commit7c13523d9b02f1319dec7dd0dece68f96f17ed35 (patch)
treecbcfcc603bc34f8352a9a9bf021a5393ccf63821 /src/cgame
parent0e56723b5c2e42c67bb12eca353caccc7a1a3886 (diff)
* Fixed a bug where menus would appear during demo playback
* Fixed a bug where delayed suicide would persist over death * Reduced turret health and damage, increased range * Generally strengthened alien buildable health and regen a little * Increased damage that hives do * Unlocked the trapper at stage 1 * Lev0 alien can now damage human defensive structures * Booster now doubles alien regeneration rate * Updated dependancies
Diffstat (limited to 'src/cgame')
-rw-r--r--src/cgame/cg_servercmds.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cgame/cg_servercmds.c b/src/cgame/cg_servercmds.c
index f01382ec..7a9ed748 100644
--- a/src/cgame/cg_servercmds.c
+++ b/src/cgame/cg_servercmds.c
@@ -908,7 +908,7 @@ static void CG_ServerCommand( void )
//the server has triggered a menu
if( !strcmp( cmd, "servermenu" ) )
{
- if( trap_Argc( ) == 2 )
+ if( trap_Argc( ) == 2 && !cg.demoPlayback )
CG_Menu( atoi( CG_Argv( 1 ) ) );
return;