From: terencehill <piuntn@gmail.com>
Date: Sun, 17 Feb 2013 14:37:02 +0000 (+0100)
Subject: Let's try to make colors of the frozen player more visible by setting initial ice... 
X-Git-Tag: xonotic-v0.7.0~61^2~40
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bc5126a5867561e185535857cf352934a5d9c64c;p=xonotic%2Fxonotic-data.pk3dir.git

Let's try to make colors of the frozen player more visible by setting initial ice alpha to 0.6
---

diff --git a/qcsrc/server/mutators/gamemode_freezetag.qc b/qcsrc/server/mutators/gamemode_freezetag.qc
index b64a1f09e..c91cc83ec 100644
--- a/qcsrc/server/mutators/gamemode_freezetag.qc
+++ b/qcsrc/server/mutators/gamemode_freezetag.qc
@@ -2,6 +2,8 @@
 .float freezetag_frozen_timeout;
 .float freezetag_revive_progress;
 .entity freezetag_ice;
+#define ICE_MAX_ALPHA 0.6
+#define ICE_MIN_ALPHA 0.1
 float freezetag_teams;
 
 float freezetag_CheckTeams();
@@ -201,6 +203,7 @@ void freezetag_Freeze(entity attacker)
 	ice.think = freezetag_Ice_Think;
 	ice.nextthink = time;
 	ice.frame = floor(random() * 21); // ice model has 20 different looking frames
+	ice.alpha = ICE_MAX_ALPHA;
 	setmodel(ice, "models/ice/ice.md3");
 
 	self.freezetag_ice = ice;
@@ -463,7 +466,7 @@ MUTATOR_HOOKFUNCTION(freezetag_PlayerPreThink)
 	entity o;
 	o = world;
 	if(self.freezetag_frozen_timeout > 0 && time < self.freezetag_frozen_timeout)
-		self.freezetag_ice.alpha = 0.1 + (self.freezetag_frozen_timeout - time) / (self.freezetag_frozen_timeout - self.freezetag_frozen_time);
+		self.freezetag_ice.alpha = ICE_MIN_ALPHA + (ICE_MAX_ALPHA - ICE_MIN_ALPHA) * (self.freezetag_frozen_timeout - time) / (self.freezetag_frozen_timeout - self.freezetag_frozen_time);
 
 	if(self.freezetag_frozen_timeout > 0 && time >= self.freezetag_frozen_timeout)
 		n = -1;