r5054 - trunk/data/qcsrc/server

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Sun Nov 16 01:53:09 EST 2008


Author: div0
Date: 2008-11-16 01:53:09 -0500 (Sun, 16 Nov 2008)
New Revision: 5054

Modified:
   trunk/data/qcsrc/server/cl_client.qc
   trunk/data/qcsrc/server/scores_rules.qc
   trunk/data/qcsrc/server/teamplay.qc
Log:
fix TDM


Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc	2008-11-16 06:41:30 UTC (rev 5053)
+++ trunk/data/qcsrc/server/cl_client.qc	2008-11-16 06:53:09 UTC (rev 5054)
@@ -1254,14 +1254,14 @@
 			MapVote_UpdateData(MSG_ONE);
 		}
 		ScoreInfo_Write(MSG_ONE);
-	}
 
-	if(inWarmupStage)
-	{
-		msg_entity = self;
-		WriteByte(MSG_ONE, SVC_TEMPENTITY);
-		WriteByte(MSG_ONE, TE_CSQC_WARMUP);
-		WriteByte(MSG_ONE, 1);
+		if(inWarmupStage)
+		{
+			msg_entity = self;
+			WriteByte(MSG_ONE, SVC_TEMPENTITY);
+			WriteByte(MSG_ONE, TE_CSQC_WARMUP);
+			WriteByte(MSG_ONE, 1);
+		}
 	}
 
 	if(g_lms)

Modified: trunk/data/qcsrc/server/scores_rules.qc
===================================================================
--- trunk/data/qcsrc/server/scores_rules.qc	2008-11-16 06:41:30 UTC (rev 5053)
+++ trunk/data/qcsrc/server/scores_rules.qc	2008-11-16 06:53:09 UTC (rev 5054)
@@ -35,7 +35,7 @@
 void ScoreRules_generic()
 {
 	CheckAllowedTeams(world);
-	if(teamplay)
+	if(teams_matter)
 	{
 		CheckAllowedTeams(world);
 		ScoreRules_basics(((c4>=0) ? 4 : (c3>=0) ? 3 : 2), SFL_SORT_PRIO_PRIMARY, SFL_SORT_PRIO_PRIMARY, TRUE);

Modified: trunk/data/qcsrc/server/teamplay.qc
===================================================================
--- trunk/data/qcsrc/server/teamplay.qc	2008-11-16 06:41:30 UTC (rev 5053)
+++ trunk/data/qcsrc/server/teamplay.qc	2008-11-16 06:53:09 UTC (rev 5054)
@@ -152,9 +152,10 @@
 	teamplay_default = cvar("teamplay_default");
 
 	if(teamplay_default)
-		cvar_set("teamplay", ftos(teamplay_default));
+		teamplay = teamplay_default;
 	else
-		cvar_set("teamplay", "3");
+		teamplay = 3;
+	cvar_set("teamplay", ftos(teamplay));
 
 	teams_matter = 1;
 }




More information about the nexuiz-commits mailing list