diff options
| author | Mikko Tiusanen <ams@daug.net> | 2014-09-24 21:40:34 +0300 |
|---|---|---|
| committer | Mikko Tiusanen <ams@daug.net> | 2014-09-24 21:40:34 +0300 |
| commit | fab71cd44004636f3298ef9cef363cf82d85c152 (patch) | |
| tree | eba517b7e71b724fcfc80652364bf2c78bb46804 /src/game/g_spawn.c | |
| parent | a23e86b0acb4e43d244d6105b59b67be8ab3e1e8 (diff) | |
Added support for forcing random teams when joining the game.
Diffstat (limited to 'src/game/g_spawn.c')
| -rw-r--r-- | src/game/g_spawn.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/g_spawn.c b/src/game/g_spawn.c index 83a9fab..8edf5c3 100644 --- a/src/game/g_spawn.c +++ b/src/game/g_spawn.c @@ -635,7 +635,7 @@ void SP_worldspawn( void ) // see if we want a warmup time trap_SetConfigstring( CS_WARMUP, "-1" ); - if( g_doWarmup.integer ) + if( g_doWarmup.integer && !g_ForceRandomTeams.integer ) { level.warmupTime = level.time - level.startTime + ( g_warmup.integer * 1000 ); trap_SetConfigstring( CS_WARMUP, va( "%i", level.warmupTime ) ); |