From: Rudolf Polzer <rpolzer@nb-04.(none)>
Date: Sun, 21 Mar 2010 19:08:22 +0000 (+0100)
Subject: activate glowmod (no longer need gameversion check);
X-Git-Tag: xonotic-v0.1.0preview~680^2~6
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=98c172f1dd14ab71a3bfa48b59152bae9b4f18b7;p=xonotic%2Fxonotic-data.pk3dir.git

activate glowmod (no longer need gameversion check);
FROM NOW ON: player models shall use _glow and _shirt, _pants no more!
---

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index e747918f6..c8fee27ae 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -2527,8 +2527,7 @@ void PlayerPreThink (void)
 
 		if(frametime)
 		{
-			if(cvar("gameversion") >= 20600) // only do this for 2.6 and above FIXME remove this check when making 2.6
-				self.glowmod = colormapPaletteColor(self.clientcolors & 0x0F, TRUE) * 2;
+			self.glowmod = colormapPaletteColor(self.clientcolors & 0x0F, TRUE) * 2;
 			player_powerups();
 		}
 
diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index 6025578a9..9d32f3234 100644
--- a/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@ -48,8 +48,7 @@ float Item_Customize()
 	if(self.weapons != (self.weapons & other.weapons))
 	{
 		self.colormod = '0 0 0';
-		if(cvar("gameversion") >= 20600) // only do this for 2.6 and above FIXME remove this check when making 2.6
-			self.glowmod = self.colormod;
+		self.glowmod = self.colormod;
 		self.alpha = 0.5 + 0.5 * g_ghost_items; // halfway more alpha
 		return TRUE;
 	}
@@ -58,8 +57,7 @@ float Item_Customize()
 		if(g_ghost_items)
 		{
 			self.colormod = stov(cvar_string("g_ghost_items_color"));
-			if(cvar("gameversion") >= 20600) // only do this for 2.6 and above FIXME remove this check when making 2.6
-				self.glowmod = self.colormod;
+			self.glowmod = self.colormod;
 			self.alpha = g_ghost_items;
 			return TRUE;
 		}
@@ -77,8 +75,7 @@ void Item_Show (entity e, float mode)
 		e.model = e.mdl;
 		e.solid = SOLID_TRIGGER;
 		e.colormod = '0 0 0';
-		if(cvar("gameversion") >= 20600) // only do this for 2.6 and above FIXME remove this check when making 2.6
-			self.glowmod = self.colormod;
+		self.glowmod = self.colormod;
 		e.alpha = 0;
 		e.customizeentityforclient = func_null;
 
@@ -90,8 +87,7 @@ void Item_Show (entity e, float mode)
 		e.model = string_null;
 		e.solid = SOLID_NOT;
 		e.colormod = '0 0 0';
-		if(cvar("gameversion") >= 20600) // only do this for 2.6 and above FIXME remove this check when making 2.6
-			self.glowmod = self.colormod;
+		self.glowmod = self.colormod;
 		e.alpha = 0;
 		e.customizeentityforclient = func_null;
 
@@ -103,8 +99,7 @@ void Item_Show (entity e, float mode)
 		e.model = e.mdl;
 		e.solid = SOLID_TRIGGER; // can STILL be picked up!
 		e.colormod = '0 0 0';
-		if(cvar("gameversion") >= 20600) // only do this for 2.6 and above FIXME remove this check when making 2.6
-			self.glowmod = self.colormod;
+		self.glowmod = self.colormod;
 		e.effects |= EF_STARDUST;
 		e.customizeentityforclient = Item_Customize;
 
@@ -116,8 +111,7 @@ void Item_Show (entity e, float mode)
 		e.model = e.mdl;
 		e.solid = SOLID_NOT;
 		e.colormod = stov(cvar_string("g_ghost_items_color"));
-		if(cvar("gameversion") >= 20600) // only do this for 2.6 and above FIXME remove this check when making 2.6
-			self.glowmod = self.colormod;
+		self.glowmod = self.colormod;
 		e.alpha = g_ghost_items;
 		e.customizeentityforclient = func_null;
 
@@ -129,8 +123,7 @@ void Item_Show (entity e, float mode)
 		e.model = string_null;
 		e.solid = SOLID_NOT;
 		e.colormod = stov(cvar_string("g_ghost_items_color"));
-		if(cvar("gameversion") >= 20600) // only do this for 2.6 and above FIXME remove this check when making 2.6
-			self.glowmod = self.colormod;
+		self.glowmod = self.colormod;
 		e.alpha = 0;
 		e.customizeentityforclient = func_null;