From: Rudolf Polzer <divverent@alientrap.org>
Date: Sun, 5 Dec 2010 20:45:08 +0000 (+0100)
Subject: fix mess from last commit
X-Git-Tag: xonotic-v0.1.0preview~69^2~3
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=84ed74c67feac494d89a5e2b49ac3684ce8814a5;ds=sidebyside

fix mess from last commit
---

diff --git a/qcsrc/server/ctf.qc b/qcsrc/server/ctf.qc
index fecfea0a7b..23cdae9fbb 100644
--- a/qcsrc/server/ctf.qc
+++ b/qcsrc/server/ctf.qc
@@ -138,7 +138,7 @@ void ctf_flag_spawnstuff()
 
 float ctf_score_value(string parameter)
 {
-	if(autocvar_g_ctf_win_mode != 2)
+	if(g_ctf_win_mode != 2)
 		return cvar(strcat("g_ctf_personal", parameter));
 	else
 		return cvar(strcat("g_ctf_flag", parameter));
diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index 192cfdab61..c9a7e61c43 100644
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -22,6 +22,7 @@ float g_cloaked, g_footsteps, g_jump_grunt, g_grappling_hook, g_midair, g_minsta
 float g_warmup_limit;
 float g_warmup_allguns;
 float g_warmup_allow_timeout;
+float g_ctf_win_mode;
 float g_ctf_ignore_frags;
 float g_ctf_reverse;
 float g_race_qualifying;
diff --git a/qcsrc/server/scores_rules.qc b/qcsrc/server/scores_rules.qc
index bf743fc08b..a4c993d83f 100644
--- a/qcsrc/server/scores_rules.qc
+++ b/qcsrc/server/scores_rules.qc
@@ -56,7 +56,7 @@ void ScoreRules_ctf()
 {
 	float sp_score, sp_caps;
 	sp_score = sp_caps = 0;
-	switch(autocvar_g_ctf_win_mode)
+	switch(g_ctf_win_mode)
 	{
 		case 0: // caps only
 			sp_caps = SFL_SORT_PRIO_PRIMARY;
diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index d0751f3b58..d47115e8fe 100644
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -239,8 +239,9 @@ void InitGameplayMode()
 		game = GAME_CTF;
 		gamemode_name = "Capture the Flag";
 		ActivateTeamplay();
+		g_ctf_win_mode = autocvar_g_ctf_win_mode;
 		g_ctf_ignore_frags = autocvar_g_ctf_ignore_frags;
-		if(autocvar_g_ctf_win_mode == 2)
+		if(g_ctf_win_mode == 2)
 		{
 			fraglimit_override = autocvar_g_ctf_capture_limit;
 			leadlimit_override = autocvar_g_ctf_capture_leadlimit;