g_freezetag_frozen_timeout 60 "frozen players will be automatically unfrozen after...

diff --git a/gamemodes.cfg b/gamemodes.cfg
index 752787536e9010edc0251a2bd9c2ac26be054fbf..0e130993d632f63dd9f7ea0625251363eb4979b1 100644 (file)
--- a/gamemodes.cfg
+++ b/gamemodes.cfg
@@ -288,6 +288,7 @@ seta g_freezetag_revive_clearspeed 1.6 "Speed at which reviving progress gets lo
 seta g_freezetag_revive_extra_size 100 "Distance in qu that you can stand from a frozen teammate to keep reviving him"
 set g_freezetag_round_timelimit 180
 seta g_freezetag_frozen_force 0.6 "How much to multiply the force on a frozen player with"
+set g_freezetag_frozen_timeout 60 "frozen players will be automatically unfrozen after this time in seconds"
 seta g_freezetag_teams_override 0
 set g_freezetag_teams 0
 

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index c40419b57a724d2b1dc0d68b895a3f384dabc254..a327ff6a7d7bf2b20d4e0d8c7af7cd7c551df56d 100644 (file)
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -852,6 +852,7 @@ string autocvar_g_forced_team_pink;
 string autocvar_g_forced_team_red;
 string autocvar_g_forced_team_yellow;
 float autocvar_g_freezetag_frozen_force;
+float autocvar_g_freezetag_frozen_timeout;
 float autocvar_g_freezetag_point_leadlimit;
 float autocvar_g_freezetag_point_limit;
 float autocvar_g_freezetag_revive_extra_size;

diff --git a/qcsrc/server/mutators/gamemode_freezetag.qc b/qcsrc/server/mutators/gamemode_freezetag.qc
index 7b947faed50db2f768f6dd340849432ea36395c3..a7c23dc52ef3181020f423db6a653877584beac8 100644 (file)
--- a/qcsrc/server/mutators/gamemode_freezetag.qc
+++ b/qcsrc/server/mutators/gamemode_freezetag.qc
@@ -179,8 +179,8 @@ void freezetag_Freeze(entity attacker)
        self.freezetag_frozen = 1;
        self.freezetag_revive_progress = 0;
        self.health = 1;
-       // if(inWarmupStage)
-               // self.freezetag_frozen_timeout = time + 5;
+       if(autocvar_g_freezetag_frozen_timeout > 0)
+               self.freezetag_frozen_timeout = time + autocvar_g_freezetag_frozen_timeout;
 
        freezetag_count_alive_players();