This is an automated email from the git hooks/post-receive script. smcv pushed a commit to annotated tag 1.42d in repository iortcw.
commit 68f77ad384e59c9515b606adeb091bdde9223b75 Author: [email protected] <[email protected]@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a> Date: Sun Jul 13 18:14:10 2014 +0000 MP: Fix g_doWarmup (Backport from Coop) --- MP/code/game/g_main.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/MP/code/game/g_main.c b/MP/code/game/g_main.c index fc5b203..daaa658 100644 --- a/MP/code/game/g_main.c +++ b/MP/code/game/g_main.c @@ -2392,16 +2392,20 @@ void CheckGameState( void ) { // check warmup latch if ( current_gs == GS_WARMUP ) { - int delay = g_warmup.integer + 1; + if ( g_warmup.integer <= 0 || !g_doWarmup.integer ) { + trap_Cvar_Set( "gamestate", va( "%i", GS_PLAYING ) ); + } else { + int delay = g_warmup.integer + 1; - if ( delay < 6 ) { - trap_Cvar_Set( "g_warmup", "5" ); - delay = 7; - } + if ( delay < 6 ) { + trap_Cvar_Set( "g_warmup", "5" ); + delay = 7; + } - level.warmupTime = level.time + ( delay * 1000 ); - trap_SetConfigstring( CS_WARMUP, va( "%i", level.warmupTime ) ); - trap_Cvar_Set( "gamestate", va( "%i", GS_WARMUP_COUNTDOWN ) ); + level.warmupTime = level.time + ( delay * 1000 ); + trap_SetConfigstring( CS_WARMUP, va( "%i", level.warmupTime ) ); + trap_Cvar_Set( "gamestate", va( "%i", GS_WARMUP_COUNTDOWN ) ); + } } } -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
