From: terencehill <piuntn@gmail.com>
Date: Tue, 11 Jun 2013 13:07:48 +0000 (+0200)
Subject: Freezetag: use warmup_start_health in warmup stage
X-Git-Tag: xonotic-v0.8.0~243^2~1^2~11
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2f2014adc81fc91cf7a3271bebe394d58b0f4bec;p=xonotic%2Fxonotic-data.pk3dir.git

Freezetag: use warmup_start_health in warmup stage
---

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index dead5a9d4..e1ad11c52 100644
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -349,7 +349,6 @@ float autocvar_g_balance_health_regenstable;
 float autocvar_g_balance_health_rot;
 float autocvar_g_balance_health_rotlinear;
 float autocvar_g_balance_health_rotstable;
-float autocvar_g_balance_health_start;
 float autocvar_g_balance_hlac_primary_ammo;
 float autocvar_g_balance_hlac_primary_animtime;
 float autocvar_g_balance_hlac_primary_damage;
diff --git a/qcsrc/server/mutators/gamemode_freezetag.qc b/qcsrc/server/mutators/gamemode_freezetag.qc
index 2e2240f95..66c1066b0 100644
--- a/qcsrc/server/mutators/gamemode_freezetag.qc
+++ b/qcsrc/server/mutators/gamemode_freezetag.qc
@@ -469,7 +469,10 @@ MUTATOR_HOOKFUNCTION(freezetag_PlayerPreThink)
 	if(n && self.freezetag_frozen) // OK, there is at least one teammate reviving us
 	{
 		self.freezetag_revive_progress = bound(0, self.freezetag_revive_progress + frametime * max(1/60, autocvar_g_freezetag_revive_speed), 1);
-		self.health = max(1, self.freezetag_revive_progress * autocvar_g_balance_health_start);
+		if(inWarmupStage)
+			self.health = max(1, self.freezetag_revive_progress * warmup_start_health);
+		else
+			self.health = max(1, self.freezetag_revive_progress * start_health);
 
 		if(self.freezetag_revive_progress >= 1)
 		{
@@ -510,7 +513,10 @@ MUTATOR_HOOKFUNCTION(freezetag_PlayerPreThink)
 	else if(!n && self.freezetag_frozen) // only if no teammate is nearby will we reset
 	{
 		self.freezetag_revive_progress = bound(0, self.freezetag_revive_progress - frametime * autocvar_g_freezetag_revive_clearspeed, 1);
-		self.health = max(1, self.freezetag_revive_progress * autocvar_g_balance_health_start);
+		if(inWarmupStage)
+			self.health = max(1, self.freezetag_revive_progress * warmup_start_health);
+		else
+			self.health = max(1, self.freezetag_revive_progress * start_health);
 	}
 	else if(!n)
 	{