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 203bdd8c8956f66d301e62da354803f99e6b5831 Author: m4n4t4...@gmail.com <m4n4t4...@gmail.com@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a> Date: Tue Sep 23 00:35:01 2014 +0000 MP: Fix team swapping in stopwatch mode --- MP/code/game/g_main.c | 1 + MP/code/game/g_session.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/MP/code/game/g_main.c b/MP/code/game/g_main.c index d2b4293..e034e13 100644 --- a/MP/code/game/g_main.c +++ b/MP/code/game/g_main.c @@ -2391,6 +2391,7 @@ void CheckGameState( void ) { // check warmup latch if ( current_gs == GS_WARMUP ) { if ( g_warmup.integer <= 0 || !g_doWarmup.integer ) { + level.warmupTime = level.time + 1000; trap_Cvar_Set( "gamestate", va( "%i", GS_PLAYING ) ); } else { int delay = g_warmup.integer + 1; diff --git a/MP/code/game/g_session.c b/MP/code/game/g_session.c index a647ac4..861c2d1 100644 --- a/MP/code/game/g_session.c +++ b/MP/code/game/g_session.c @@ -113,7 +113,7 @@ void G_ReadSessionData( gclient_t *client ) { test = g_currentRound.integer == 1; } - if ( g_gametype.integer == GT_WOLF_STOPWATCH && test ) { + if ( g_gametype.integer == GT_WOLF_STOPWATCH && level.warmupTime > 0 && test ) { if ( client->sess.sessionTeam == TEAM_RED ) { client->sess.sessionTeam = TEAM_BLUE; } else if ( client->sess.sessionTeam == TEAM_BLUE ) { -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits