From: terencehill <piuntn@gmail.com>
Date: Mon, 11 Feb 2013 23:29:51 +0000 (+0100)
Subject: g_freezetag_frozen_timeout 60 "frozen players will be automatically unfrozen after... 
X-Git-Tag: xonotic-v0.7.0~61^2~54
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d1dea853c432b4acd366dfd37d5f172401cd6b9a;p=xonotic%2Fxonotic-data.pk3dir.git

g_freezetag_frozen_timeout 60 "frozen players will be automatically unfrozen after this time in seconds"
---

diff --git a/gamemodes.cfg b/gamemodes.cfg
index 752787536..0e130993d 100644
--- 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 c40419b57..a327ff6a7 100644
--- 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 7b947faed..a7c23dc52 100644
--- 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();