From b042448faef9f0e87817e40f06219d0673d6954d Mon Sep 17 00:00:00 2001
From: "M. Kristall" <mkpdev@gmail.com>
Date: Wed, 18 Apr 2012 06:52:56 +0000
Subject: * Allow joining teams during warmup

---
 src/game/g_cmds.c |  7 -------
 src/game/g_main.c | 15 +++++++++------
 2 files changed, 9 insertions(+), 13 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 ] )
diff --git a/src/game/g_main.c b/src/game/g_main.c
index dc9cdd9d..fda51ebd 100644
--- a/src/game/g_main.c
+++ b/src/game/g_main.c
@@ -2471,12 +2471,15 @@ void G_RunFrame( int levelTime )
   G_UnlaggedStore( );
 
   G_CountSpawns( );
-  G_CalculateBuildPoints( );
-  G_CalculateStages( );
-  G_SpawnClients( TEAM_ALIENS );
-  G_SpawnClients( TEAM_HUMANS );
-  G_CalculateAvgPlayers( );
-  G_UpdateZaps( msec );
+  if( !g_doWarmup.integer || level.warmupTime <= level.time )
+  {
+    G_CalculateBuildPoints( );
+    G_CalculateStages( );
+    G_SpawnClients( TEAM_ALIENS );
+    G_SpawnClients( TEAM_HUMANS );
+    G_CalculateAvgPlayers( );
+    G_UpdateZaps( msec );
+  }
 
   // see if it is time to end the level
   CheckExitRules( );
-- 
cgit