summaryrefslogtreecommitdiff
path: root/src/game/g_cmds.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/g_cmds.c')
-rw-r--r--src/game/g_cmds.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c
index 8fc9a424..ac88b825 100644
--- a/src/game/g_cmds.c
+++ b/src/game/g_cmds.c
@@ -560,6 +560,13 @@ void Cmd_Team_f( gentity_t *ent )
else if( oldteam == TEAM_HUMANS )
humans--;
+ // 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 ] )