r4376 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-09-06 11:00:48 -0400 (Sat, 06 Sep 2008)
New Revision: 4376

Modified:
   trunk/data/qcsrc/server/miscfunctions.qc
   trunk/data/qcsrc/server/vote.qc
Log:
tourney + race qualifying mode neither makes sense nor does it work. Disabled.


Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc	2008-09-06 14:55:01 UTC (rev 4375)
+++ trunk/data/qcsrc/server/miscfunctions.qc	2008-09-06 15:00:48 UTC (rev 4376)
@@ -823,6 +823,9 @@
 	sv_pogostick = cvar("sv_pogostick");
 	sv_doublejump = cvar("sv_doublejump");
 
+	if(g_race && g_race_qualifying == 2)
+		g_tourney = 0; // these modes cannot work together
+
 	g_pickup_respawntime_short = cvar("g_pickup_respawntime_short");
 	g_pickup_respawntime_medium = cvar("g_pickup_respawntime_medium");
 	g_pickup_respawntime_long = cvar("g_pickup_respawntime_long");

Modified: trunk/data/qcsrc/server/vote.qc
===================================================================
--- trunk/data/qcsrc/server/vote.qc	2008-09-06 14:55:01 UTC (rev 4375)
+++ trunk/data/qcsrc/server/vote.qc	2008-09-06 15:00:48 UTC (rev 4376)
@@ -433,8 +433,7 @@
 		}
 	} else {
 		//in g_tourney mode and if the vote is a timelimit-change, don't change it immediately but after restart
-		if(cvar("g_tourney")
-		   && substring(votecalledvote, 0, 10) == "timelimit ") {
+		if(g_tourney && substring(votecalledvote, 0, 10) == "timelimit ") {
 			if( stof(substring(votecalledvote, 10, strlen(votecalledvote) - 10)) > 0 ) {
 				timelimit_orig = stof(substring(votecalledvote, 10, strlen(votecalledvote) - 10));
 				bprint(strcat("The timelimit will be set to ", ftos(timelimit_orig), " minutes after the next restart!\n"));
@@ -552,7 +551,7 @@
 	}
 
 	//in tournament mode, if we have at least one player then don't make the vote dependent on spectators (so specs don't have to press F1)
-	if(cvar("g_tourney"))
+	if(g_tourney)
 	if(realplayercount > 0) {
 		yescount = realplayeryescount;
 		nocount = realplayernocount;