summaryrefslogtreecommitdiff
path: root/src/game/g_cmds.c
diff options
context:
space:
mode:
authorM. Kristall <mkpdev@gmail.com>2012-04-18 06:52:56 +0000
committerTim Angus <tim@ngus.net>2013-01-03 00:18:15 +0000
commitb042448faef9f0e87817e40f06219d0673d6954d (patch)
tree748ff140405c588190d1c1e25a428b33d62c23ac /src/game/g_cmds.c
parentd8f8b394b0a448a7013f49d021295094d1438cf8 (diff)
* Allow joining teams during warmup
Diffstat (limited to 'src/game/g_cmds.c')
-rw-r--r--src/game/g_cmds.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c
index 9e3eff42..7b2b9948 100644
--- a/src/game/g_cmds.c
+++ b/src/game/g_cmds.c
@@ -625,13 +625,6 @@ void Cmd_Team_f( gentity_t *ent )
return;
}
- // disallow joining teams during warmup
- if( g_doWarmup.integer && ( ( level.warmupTime - level.time ) / 1000 ) > 0 )
- {
- G_TriggerMenu( ent - g_entities, MN_WARMUP );
- return;
- }
-
trap_Argv( 1, s, sizeof( s ) );
if( !s[ 0 ] )