[nexuiz-commits] r7862 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-09-22 08:03:09 -0400 (Tue, 22 Sep 2009)
New Revision: 7862

Modified:
   trunk/data/qcsrc/server/t_items.qc
Log:
better ghosting of weaponstay-3 weapons


Modified: trunk/data/qcsrc/server/t_items.qc
===================================================================
--- trunk/data/qcsrc/server/t_items.qc	2009-09-22 09:08:35 UTC (rev 7861)
+++ trunk/data/qcsrc/server/t_items.qc	2009-09-22 12:03:09 UTC (rev 7862)
@@ -41,6 +41,17 @@
 
 .float max_armorvalue;
 
+float Item_Customize()
+{
+	if(self.spawnshieldtime)
+		return TRUE;
+	if(self.weapons != (self.weapons & other.weapons))
+		self.alpha = 0.5;
+	else
+		self.alpha = 0.1;
+	return TRUE;
+}
+
 void Item_Show (entity e, float mode)
 {
 	e.effects &~= EF_ADDITIVE | EF_STARDUST | EF_FULLBRIGHT;
@@ -51,11 +62,8 @@
 		e.solid = SOLID_TRIGGER;
 		//e.colormod = '0 0 0';
 		e.alpha = 0;
+		e.customizeentityforclient = func_null;
 
-		// special cases
-		if (cvar("g_fullbrightitems"))
-			e.effects = e.effects | EF_FULLBRIGHT;
-
 		e.spawnshieldtime = 1;
 	}
 	else if (mode < 0)
@@ -65,6 +73,7 @@
 		e.solid = SOLID_NOT;
 		//e.colormod = '0 0 0';
 		e.alpha = 0;
+		e.customizeentityforclient = func_null;
 
 		e.spawnshieldtime = 1;
 	}
@@ -76,11 +85,8 @@
 		e.effects |= EF_STARDUST;
 		//e.colormod = '0.2 1 0.2';
 		e.alpha = 0.5;
+		e.customizeentityforclient = Item_Customize;
 
-		// special cases
-		if (cvar("g_fullbrightitems"))
-			e.effects = e.effects | EF_FULLBRIGHT;
-
 		e.spawnshieldtime = 0; // field indicates whether picking it up may give you anything other than the weapon
 	}
 	else
@@ -89,7 +95,8 @@
 		e.model = e.mdl;
 		e.solid = SOLID_NOT;
 		//e.colormod = '0.2 1 0.2';
-		e.alpha = 0.15;
+		e.alpha = 0.1;
+		e.customizeentityforclient = func_null;
 
 		e.spawnshieldtime = 1;
 	}