Add an option to use team spawns in keyhunt

diff --git a/gamemodes.cfg b/gamemodes.cfg
index 340d01b9dcec368814affe8aaa70103b82945983..31a0f33d3b04116ccafc567b3e5bb0e8de509ab1 100644 (file)
--- a/gamemodes.cfg
+++ b/gamemodes.cfg
@@ -438,6 +438,7 @@ set g_balance_keyhunt_protecttime 0.8
 set g_balance_keyhunt_damageforcescale 1
 seta g_keyhunt_teams_override 0
 set g_keyhunt_teams 0
+set g_keyhunt_team_spawns 0 "when 1, players spawn from the team spawnpoints of the map, if any"
 
 
 // ===================

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index 9bbcb182349eba44ee0cea10b82bcad3513a6195..3549266000ccd1e044265a27080ea1ae1cc35bad 100644 (file)
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -369,6 +369,7 @@ int autocvar_g_keepawayball_effects;
 float autocvar_g_keepawayball_respawntime;
 int autocvar_g_keepawayball_trail_color;
 int autocvar_g_keyhunt_point_leadlimit;
+bool autocvar_g_keyhunt_team_spawns;
 #define autocvar_g_keyhunt_point_limit cvar("g_keyhunt_point_limit")
 int autocvar_g_keyhunt_teams;
 int autocvar_g_keyhunt_teams_override;

diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index b14386bd4975f2bdaa21ea8fbe90ea34cb4edaaf..c7703e2e5d5cda237828710df111134bbabad7dc 100644 (file)
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -141,6 +141,8 @@ void InitGameplayMode()
                ActivateTeamplay();
                fraglimit_override = autocvar_g_keyhunt_point_limit;
                leadlimit_override = autocvar_g_keyhunt_point_leadlimit;
+               if(autocvar_g_keyhunt_team_spawns)
+                       have_team_spawns = -1; // request team spawns
                MUTATOR_ADD(gamemode_keyhunt);
        }