r5123 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-11-27 09:14:42 -0500 (Thu, 27 Nov 2008)
New Revision: 5123

Modified:
   trunk/data/qcsrc/server/scores_rules.qc
   trunk/data/qcsrc/server/teamplay.qc
Log:
for now, hard code points-based ctf scoring for campaign levels


Modified: trunk/data/qcsrc/server/scores_rules.qc
===================================================================
--- trunk/data/qcsrc/server/scores_rules.qc	2008-11-27 13:33:46 UTC (rev 5122)
+++ trunk/data/qcsrc/server/scores_rules.qc	2008-11-27 14:14:42 UTC (rev 5123)
@@ -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: trunk/data/qcsrc/server/teamplay.qc
===================================================================
--- trunk/data/qcsrc/server/teamplay.qc	2008-11-27 13:33:46 UTC (rev 5122)
+++ trunk/data/qcsrc/server/teamplay.qc	2008-11-27 14:14:42 UTC (rev 5123)
@@ -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");