[quake3-commits] r2316 - trunk/code/game

[DONOTREPLY at icculus.org]

Author: ztm
Date: 2012-09-09 18:14:15 -0400 (Sun, 09 Sep 2012)
New Revision: 2316

Modified:
   trunk/code/game/g_main.c
Log:
Fix g_warmup < 2 causing client prediction issues (bug #5740). (Reused code for tournament gametype.)

Modified: trunk/code/game/g_main.c
===================================================================
--- trunk/code/game/g_main.c	2012-09-08 23:19:06 UTC (rev 2315)
+++ trunk/code/game/g_main.c	2012-09-09 22:14:15 UTC (rev 2316)
@@ -1522,7 +1522,12 @@
 		// if all players have arrived, start the countdown
 		if ( level.warmupTime < 0 ) {
 			// fudge by -1 to account for extra delays
-			level.warmupTime = level.time + ( g_warmup.integer - 1 ) * 1000;
+			if ( g_warmup.integer > 1 ) {
+				level.warmupTime = level.time + ( g_warmup.integer - 1 ) * 1000;
+			} else {
+				level.warmupTime = 0;
+			}
+
 			trap_SetConfigstring( CS_WARMUP, va("%i", level.warmupTime) );
 			return;
 		}