From 2c0dd57292f1587ac942a67452cef5ec06bc9dce Mon Sep 17 00:00:00 2001 From: div0 Date: Thu, 27 Nov 2008 14:14:42 +0000 Subject: [PATCH] for now, hard code points-based ctf scoring for campaign levels git-svn-id: svn://svn.icculus.org/nexuiz/trunk@5123 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/scores_rules.qc | 2 +- data/qcsrc/server/teamplay.qc | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/data/qcsrc/server/scores_rules.qc b/data/qcsrc/server/scores_rules.qc index b6191a288..8115ec972 100644 --- a/data/qcsrc/server/scores_rules.qc +++ b/data/qcsrc/server/scores_rules.qc @@ -56,7 +56,7 @@ void ScoreRules_ctf() { 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; diff --git a/data/qcsrc/server/teamplay.qc b/data/qcsrc/server/teamplay.qc index 048100ca7..78b84d9e7 100644 --- a/data/qcsrc/server/teamplay.qc +++ b/data/qcsrc/server/teamplay.qc @@ -228,7 +228,10 @@ void InitGameplayMode() 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"); -- 2.39.2