[nexuiz-commits] r6594 - trunk/data/qcsrc/server

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Sun Apr 26 08:16:30 EDT 2009


Author: mrbougo
Date: 2009-04-26 08:16:29 -0400 (Sun, 26 Apr 2009)
New Revision: 6594

Modified:
   trunk/data/qcsrc/server/nexball.qc
   trunk/data/qcsrc/server/scores_rules.qc
   trunk/data/qcsrc/server/teamplay.qc
Log:
forgot a few changes to support >2 teams

Modified: trunk/data/qcsrc/server/nexball.qc
===================================================================
--- trunk/data/qcsrc/server/nexball.qc	2009-04-26 11:23:57 UTC (rev 6593)
+++ trunk/data/qcsrc/server/nexball.qc	2009-04-26 12:16:29 UTC (rev 6594)
@@ -372,6 +372,7 @@
 {
 	if (find(world, classname, "nexball_team") == world)
 		nb_spawnteams();
+	ScoreRules_nexball();
 }
 
 

Modified: trunk/data/qcsrc/server/scores_rules.qc
===================================================================
--- trunk/data/qcsrc/server/scores_rules.qc	2009-04-26 11:23:57 UTC (rev 6593)
+++ trunk/data/qcsrc/server/scores_rules.qc	2009-04-26 12:16:29 UTC (rev 6594)
@@ -179,7 +179,7 @@
 #define SP_NEXBALL_FAULTS 5
 void ScoreRules_nexball()
 {
-	ScoreRules_basics(2, 0, 0, TRUE);
+	ScoreRules_basics(((c4>=0) ? 4 : (c3>=0) ? 3 : 2), 0, 0, TRUE);
 	ScoreInfo_SetLabel_TeamScore(   ST_NEXBALL_GOALS,  "goals", SFL_SORT_PRIO_PRIMARY);
 	ScoreInfo_SetLabel_PlayerScore( SP_NEXBALL_GOALS,  "goals", SFL_SORT_PRIO_PRIMARY);
 	ScoreInfo_SetLabel_PlayerScore(SP_NEXBALL_FAULTS, "faults", SFL_SORT_PRIO_SECONDARY | SFL_LOWER_IS_BETTER);

Modified: trunk/data/qcsrc/server/teamplay.qc
===================================================================
--- trunk/data/qcsrc/server/teamplay.qc	2009-04-26 11:23:57 UTC (rev 6593)
+++ trunk/data/qcsrc/server/teamplay.qc	2009-04-26 12:16:29 UTC (rev 6594)
@@ -332,7 +332,6 @@
 		fraglimit_override = cvar("g_nexball_goallimit");
 		ActivateTeamplay();
 		nb_init();
-		ScoreRules_nexball();
 	}
 
 	if(teams_matter)



More information about the nexuiz-commits mailing list