r1847 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2006-08-22 18:36:35 -0400 (Tue, 22 Aug 2006)
New Revision: 1847

Modified:
   trunk/data/qcsrc/server/cl_client.qc
   trunk/data/qcsrc/server/cl_weaponsystem.qc
   trunk/data/qcsrc/server/defs.qh
   trunk/data/qcsrc/server/g_world.qc
Log:
New and pointless mutator: g_running_guns :P


Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc	2006-08-22 21:07:19 UTC (rev 1846)
+++ trunk/data/qcsrc/server/cl_client.qc	2006-08-22 22:36:35 UTC (rev 1847)
@@ -600,7 +600,7 @@
 
 		CL_SpawnWeaponentity();
 		self.alpha = default_player_alpha;
-		self.exteriorweaponentity.alpha = default_player_alpha;
+		self.exteriorweaponentity.alpha = default_weapon_alpha;
 
 		self.lms_nextcheck = time + cvar("g_lms_campcheck_interval")*2;
 		self.lms_traveled_distance = 0;
@@ -1049,7 +1049,7 @@
 			if (time > self.strength_finished)
 			{
 				self.alpha = default_player_alpha;
-				self.exteriorweaponentity.alpha = default_player_alpha;
+				self.exteriorweaponentity.alpha = default_weapon_alpha;
 				self.items = self.items - (self.items & IT_STRENGTH);
 				sprint(self, "^3Invisibility has worn off\n");
 			}

Modified: trunk/data/qcsrc/server/cl_weaponsystem.qc
===================================================================
--- trunk/data/qcsrc/server/cl_weaponsystem.qc	2006-08-22 21:07:19 UTC (rev 1846)
+++ trunk/data/qcsrc/server/cl_weaponsystem.qc	2006-08-22 22:36:35 UTC (rev 1847)
@@ -155,7 +155,10 @@
 		// owner is currently being teleported, so don't apply EF_NODRAW otherwise the viewmodel would "blink"
 		self.effects = self.effects - (self.effects & EF_NODRAW);
 
-	self.alpha = self.owner.alpha;
+	if(self.owner.alpha >= 0)
+		self.alpha = self.owner.alpha;
+	else
+		self.alpha = 1;
 	self.colormap = self.owner.colormap;
 
 	self.angles = '0 0 0';

Modified: trunk/data/qcsrc/server/defs.qh
===================================================================
--- trunk/data/qcsrc/server/defs.qh	2006-08-22 21:07:19 UTC (rev 1846)
+++ trunk/data/qcsrc/server/defs.qh	2006-08-22 22:36:35 UTC (rev 1847)
@@ -252,6 +252,7 @@
 .float isdecor;
 
 float default_player_alpha;
+float default_weapon_alpha;
 
 .float() customizeentityforclient;
 .float cvar_cl_playerdetailreduction;

Modified: trunk/data/qcsrc/server/g_world.qc
===================================================================
--- trunk/data/qcsrc/server/g_world.qc	2006-08-22 21:07:19 UTC (rev 1846)
+++ trunk/data/qcsrc/server/g_world.qc	2006-08-22 22:36:35 UTC (rev 1847)
@@ -3,15 +3,22 @@
 
 void SetDefaultAlpha()
 {
-	if(cvar("g_cloaked"))
+	if(cvar("g_running_guns"))
 	{
+		default_player_alpha = -1;
+		default_weapon_alpha = +1;
+	}
+	else if(cvar("g_cloaked"))
+	{
 		default_player_alpha = cvar("g_balance_cloaked_alpha");
+		default_weapon_alpha = default_player_alpha;
 	}
 	else
 	{
 		default_player_alpha = cvar("g_player_alpha");
 		if(default_player_alpha <= 0)
 			default_player_alpha = 1;
+		default_weapon_alpha = default_player_alpha;
 	}
 }