From e4f9890f27ce9c12d1b8202b21dbed214342e9c9 Mon Sep 17 00:00:00 2001 From: terencehill Date: Fri, 18 Nov 2016 21:14:49 +0100 Subject: [PATCH] Fix number of teams defaulting to 2 for some game modes (CA, FT and KH) --- qcsrc/server/mutators/mutator/gamemode_ca.qh | 5 +++-- qcsrc/server/mutators/mutator/gamemode_freezetag.qc | 4 ++-- qcsrc/server/mutators/mutator/gamemode_keyhunt.qc | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/qcsrc/server/mutators/mutator/gamemode_ca.qh b/qcsrc/server/mutators/mutator/gamemode_ca.qh index 8009feb8a..5aba748fd 100644 --- a/qcsrc/server/mutators/mutator/gamemode_ca.qh +++ b/qcsrc/server/mutators/mutator/gamemode_ca.qh @@ -6,7 +6,7 @@ int autocvar_g_ca_point_limit; int autocvar_g_ca_point_leadlimit; float autocvar_g_ca_round_timelimit; bool autocvar_g_ca_team_spawns; -int autocvar_g_ca_teams; +//int autocvar_g_ca_teams; int autocvar_g_ca_teams_override; float autocvar_g_ca_warmup; @@ -33,7 +33,8 @@ REGISTER_MUTATOR(ca, false) allowed_to_spawn = true; ca_teams = autocvar_g_ca_teams_override; - if (ca_teams < 2) ca_teams = autocvar_g_ca_teams; + if (ca_teams < 2) + ca_teams = cvar("g_ca_teams"); // read the cvar directly as it gets written earlier in the same frame ca_teams = bound(2, ca_teams, 4); int teams = 0; diff --git a/qcsrc/server/mutators/mutator/gamemode_freezetag.qc b/qcsrc/server/mutators/mutator/gamemode_freezetag.qc index 32c91d8c1..cec7d950e 100644 --- a/qcsrc/server/mutators/mutator/gamemode_freezetag.qc +++ b/qcsrc/server/mutators/mutator/gamemode_freezetag.qc @@ -3,7 +3,7 @@ float autocvar_g_freezetag_frozen_maxtime; float autocvar_g_freezetag_revive_clearspeed; float autocvar_g_freezetag_round_timelimit; -int autocvar_g_freezetag_teams; +//int autocvar_g_freezetag_teams; int autocvar_g_freezetag_teams_override; float autocvar_g_freezetag_warmup; @@ -573,7 +573,7 @@ void freezetag_Initialize() { freezetag_teams = autocvar_g_freezetag_teams_override; if(freezetag_teams < 2) - freezetag_teams = autocvar_g_freezetag_teams; + freezetag_teams = cvar("g_freezetag_teams"); // read the cvar directly as it gets written earlier in the same frame freezetag_teams = bound(2, freezetag_teams, 4); int teams = 0; diff --git a/qcsrc/server/mutators/mutator/gamemode_keyhunt.qc b/qcsrc/server/mutators/mutator/gamemode_keyhunt.qc index 8d61b86ab..e4918ee14 100644 --- a/qcsrc/server/mutators/mutator/gamemode_keyhunt.qc +++ b/qcsrc/server/mutators/mutator/gamemode_keyhunt.qc @@ -17,7 +17,7 @@ int autocvar_g_balance_keyhunt_score_destroyed_ownfactor; int autocvar_g_balance_keyhunt_score_push; float autocvar_g_balance_keyhunt_throwvelocity; -int autocvar_g_keyhunt_teams; +//int autocvar_g_keyhunt_teams; int autocvar_g_keyhunt_teams_override; // #define KH_PLAYER_USE_ATTACHMENT @@ -992,7 +992,7 @@ void kh_Initialize() // sets up th KH environment // setup variables kh_teams = autocvar_g_keyhunt_teams_override; if(kh_teams < 2) - kh_teams = autocvar_g_keyhunt_teams; + kh_teams = cvar("g_keyhunt_teams"); // read the cvar directly as it gets written earlier in the same frame kh_teams = bound(2, kh_teams, 4); int teams = 0; -- 2.39.2