[iortcw] 178/497: MP: Fix team swapping in stopwatch gametype when there is no warmup

[Simon McVittie]

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 92ef021c4fa8760b04046fa8b9bbf3f8e81b1304
Author: M4N4T4RMS at gmail.com <M4N4T4RMS at gmail.com@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a>
Date:   Sun Aug 10 20:34:01 2014 +0000

    MP: Fix team swapping in stopwatch gametype when there is no warmup
---
 MP/code/game/g_main.c    | 2 +-
 MP/code/game/g_session.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/MP/code/game/g_main.c b/MP/code/game/g_main.c
index daaa658..e8537ff 100644
--- a/MP/code/game/g_main.c
+++ b/MP/code/game/g_main.c
@@ -206,7 +206,7 @@ cvarTable_t gameCvarTable[] = {
 	{ &g_teamForceBalance, "g_teamForceBalance", "0", CVAR_ARCHIVE  },                            // NERVE - SMF - merge from team arena
 
 	{ &g_warmup, "g_warmup", "20", CVAR_ARCHIVE, 0, qtrue  },
-	{ &g_doWarmup, "g_doWarmup", "0", CVAR_ARCHIVE, 0, qtrue  },
+	{ &g_doWarmup, "g_doWarmup", "1", CVAR_ARCHIVE, 0, qtrue  },
 
 	// NERVE - SMF
 	{ &g_warmupLatch, "g_warmupLatch", "1", 0, 0, qfalse },
diff --git a/MP/code/game/g_session.c b/MP/code/game/g_session.c
index 861c2d1..2061bb5 100644
--- a/MP/code/game/g_session.c
+++ b/MP/code/game/g_session.c
@@ -85,7 +85,7 @@ void G_ReadSessionData( gclient_t *client ) {
 	const char  *var;
 	qboolean test;
 
-	var = va( "session%i", (int)(client - level.clients) );
+	var = va( "session%i", client - level.clients );
 	trap_Cvar_VariableStringBuffer( var, s, sizeof( s ) );
 
 	sscanf( s, "%i %i %i %i %i %i %i %i %i %i %i %i %i %i %i",       // DHM - Nerve
@@ -113,7 +113,7 @@ void G_ReadSessionData( gclient_t *client ) {
 		test = g_currentRound.integer == 1;
 	}
 
-	if ( g_gametype.integer == GT_WOLF_STOPWATCH && level.warmupTime > 0 && test ) {
+	if ( g_gametype.integer == GT_WOLF_STOPWATCH && 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