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

[DONOTREPLY at icculus.org]

Author: mrbougo
Date: 2009-08-04 11:45:30 -0400 (Tue, 04 Aug 2009)
New Revision: 7331

Modified:
   trunk/data/qcsrc/server/nexball.qc
   trunk/data/qcsrc/server/scores_rules.qc
Log:
fix nexball team counts

Modified: trunk/data/qcsrc/server/nexball.qc
===================================================================
--- trunk/data/qcsrc/server/nexball.qc	2009-08-04 14:09:52 UTC (rev 7330)
+++ trunk/data/qcsrc/server/nexball.qc	2009-08-04 15:45:30 UTC (rev 7331)
@@ -439,7 +439,7 @@
 {
 	if (find(world, classname, "nexball_team") == world)
 		nb_spawnteams();
-	ScoreRules_nexball();
+	ScoreRules_nexball(nb_teams);
 }
 
 

Modified: trunk/data/qcsrc/server/scores_rules.qc
===================================================================
--- trunk/data/qcsrc/server/scores_rules.qc	2009-08-04 14:09:52 UTC (rev 7330)
+++ trunk/data/qcsrc/server/scores_rules.qc	2009-08-04 15:45:30 UTC (rev 7331)
@@ -177,9 +177,9 @@
 #define ST_NEXBALL_GOALS 1
 #define SP_NEXBALL_GOALS 4
 #define SP_NEXBALL_FAULTS 5
-void ScoreRules_nexball()
+void ScoreRules_nexball(float teams)
 {
-	ScoreRules_basics(((c4>=0) ? 4 : (c3>=0) ? 3 : 2), 0, 0, TRUE);
+	ScoreRules_basics(teams, 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);