r5125 - in branches/nexuiz-2.0: . data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-11-27 09:34:57 -0500 (Thu, 27 Nov 2008)
New Revision: 5125

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/qcsrc/server/scores_rules.qc
   branches/nexuiz-2.0/data/qcsrc/server/teamplay.qc
Log:
r5123 | div0 | 2008-11-27 15:14:42 +0100 (Thu, 27 Nov 2008) | 2 lines
for now, hard code points-based ctf scoring for campaign levels

Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2008-11-27 14:24:49 UTC (rev 5124)
+++ branches/nexuiz-2.0/.patchsets	2008-11-27 14:34:57 UTC (rev 5125)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-5121
+revisions_applied = 1-5123

Modified: branches/nexuiz-2.0/data/qcsrc/server/scores_rules.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/scores_rules.qc	2008-11-27 14:24:49 UTC (rev 5124)
+++ branches/nexuiz-2.0/data/qcsrc/server/scores_rules.qc	2008-11-27 14:34:57 UTC (rev 5125)
@@ -56,7 +56,7 @@
 {
 	float sp_score, sp_caps;
 	sp_score = sp_caps = 0;
-	switch(cvar("g_ctf_win_mode"))
+	switch(g_ctf_win_mode)
 	{
 		case 0: // caps only
 			sp_caps = SFL_SORT_PRIO_PRIMARY;

Modified: branches/nexuiz-2.0/data/qcsrc/server/teamplay.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/teamplay.qc	2008-11-27 14:24:49 UTC (rev 5124)
+++ branches/nexuiz-2.0/data/qcsrc/server/teamplay.qc	2008-11-27 14:34:57 UTC (rev 5125)
@@ -228,7 +228,10 @@
 		game = GAME_CTF;
 		gamemode_name = "Capture the Flag";
 		ActivateTeamplay();
-		g_ctf_win_mode = cvar("g_ctf_win_mode");
+		if(g_campaign)
+			g_ctf_win_mode = 2;
+		else
+			g_ctf_win_mode = cvar("g_ctf_win_mode");
 		g_ctf_ignore_frags = cvar("g_ctf_ignore_frags");
 		if(g_ctf_win_mode == 2)
 			fraglimit_override = cvar("g_ctf_capture_limit");