From 7f62098bd33ec14fd1f113024305445b88b55cf1 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Sun, 5 Dec 2010 21:44:02 +0100 Subject: [PATCH] eliminate the g_ctf_win_mode global; campaign uses default win mode now --- qcsrc/server/ctf.qc | 2 +- qcsrc/server/defs.qh | 1 - qcsrc/server/scores_rules.qc | 2 +- qcsrc/server/teamplay.qc | 6 +----- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/qcsrc/server/ctf.qc b/qcsrc/server/ctf.qc index 23cdae9fbb..fecfea0a7b 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(g_ctf_win_mode != 2) + if(autocvar_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 c9a7e61c43..192cfdab61 100644 --- a/qcsrc/server/defs.qh +++ b/qcsrc/server/defs.qh @@ -22,7 +22,6 @@ 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 a4c993d83f..bf743fc08b 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(g_ctf_win_mode) + switch(autocvar_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 fffae0b85e..d0751f3b58 100644 --- a/qcsrc/server/teamplay.qc +++ b/qcsrc/server/teamplay.qc @@ -239,12 +239,8 @@ void InitGameplayMode() game = GAME_CTF; gamemode_name = "Capture the Flag"; ActivateTeamplay(); - if(autocvar_g_campaign) - g_ctf_win_mode = 2; - else - g_ctf_win_mode = autocvar_g_ctf_win_mode; g_ctf_ignore_frags = autocvar_g_ctf_ignore_frags; - if(g_ctf_win_mode == 2) + if(autocvar_g_ctf_win_mode == 2) { fraglimit_override = autocvar_g_ctf_capture_limit; leadlimit_override = autocvar_g_ctf_capture_leadlimit; -- 2.39.2