Fix number of teams defaulting to 2 for some game modes (CA, FT and KH)

diff --git a/qcsrc/server/mutators/mutator/gamemode_ca.qh b/qcsrc/server/mutators/mutator/gamemode_ca.qh
index 8009feb8a569c252694450672b86367b5ced92be..5aba748fd5348207e81b7dacdbde39288fbde814 100644 (file)
--- 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_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;
 
 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;
                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;
                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 32c91d8c17d20fb6f6e9fdaeb4eb9b0f0e31ec98..cec7d950e9076cdecfc573fdaeafe9be16f409e2 100644 (file)
--- 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;
 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;
 
 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_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;
        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 8d61b86abff1cb34108928a1a23491d4ac19b86a..e4918ee14b03e85a9cbb2e2a24a56f8a62cccd8a 100644 (file)
--- 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_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
 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)
        // 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;
        kh_teams = bound(2, kh_teams, 4);
 
        int teams = 0;