[nexuiz-commits] r8646 - in trunk/data: . qcsrc/server

[DONOTREPLY at icculus.org]

Author: fruitiex
Date: 2010-02-13 17:58:42 -0500 (Sat, 13 Feb 2010)
New Revision: 8646

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/data/qcsrc/server/miscfunctions.qc
   trunk/data/qcsrc/server/t_items.qc
Log:
Taoki's hologram items patch


Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2010-02-13 16:21:08 UTC (rev 8645)
+++ trunk/data/defaultNexuiz.cfg	2010-02-13 22:58:42 UTC (rev 8646)
@@ -1716,7 +1716,8 @@
 set g_triggerimpulse_directional_multiplier 1 "trigger_impulse directional field multiplier"
 set g_triggerimpulse_radial_multiplier 1 "trigger_impulse radial field multiplier"
 
-set g_ghost_items 1 "enable ghosted items (when between 0 and 1, overrides the alpha value)"
+seta g_ghost_items 1 "enable ghosted items (when between 0 and 1, overrides the alpha value)"
+seta g_ghost_items_color "-1 -1 -1" "color of ghosted items, 0 0 0 leaves the color unchanged"
 
 set sv_weaponstats_damagefile "" "when set to a file name, per-weapon damage stats get written to that file"
 set sv_weaponstats_killfile "" "when set to a file name, per-weapon kill stats get written to that file"

Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc	2010-02-13 16:21:08 UTC (rev 8645)
+++ trunk/data/qcsrc/server/miscfunctions.qc	2010-02-13 22:58:42 UTC (rev 8646)
@@ -1322,7 +1322,7 @@
 	g_ghost_items = cvar("g_ghost_items");
 
 	if(g_ghost_items >= 1)
-		g_ghost_items = 0.13; // default alpha value
+		g_ghost_items = 0.25; // default alpha value
 
 	if not(inWarmupStage && !g_ca)
 		game_starttime = cvar("g_start_delay");

Modified: trunk/data/qcsrc/server/t_items.qc
===================================================================
--- trunk/data/qcsrc/server/t_items.qc	2010-02-13 16:21:08 UTC (rev 8645)
+++ trunk/data/qcsrc/server/t_items.qc	2010-02-13 22:58:42 UTC (rev 8646)
@@ -47,6 +47,7 @@
 		return TRUE;
 	if(self.weapons != (self.weapons & other.weapons))
 	{
+		self.colormod = self.glowmod = stov(cvar_string("g_ghost_items_color"));
 		self.alpha = 0.5 + 0.5 * g_ghost_items; // halfway more alpha
 		return TRUE;
 	}
@@ -54,6 +55,7 @@
 	{
 		if(g_ghost_items)
 		{
+			self.colormod = self.glowmod = stov(cvar_string("g_ghost_items_color"));
 			self.alpha = g_ghost_items;
 			return TRUE;
 		}
@@ -70,7 +72,7 @@
 		// make the item look normal, and be touchable
 		e.model = e.mdl;
 		e.solid = SOLID_TRIGGER;
-		//e.colormod = '0 0 0';
+		e.colormod = e.glowmod = '0 0 0';
 		e.alpha = 0;
 		e.customizeentityforclient = func_null;
 
@@ -104,7 +106,7 @@
 		// make the item translucent green and not touchable
 		e.model = e.mdl;
 		e.solid = SOLID_NOT;
-		//e.colormod = '0.2 1 0.2';
+		e.colormod = e.glowmod = stov(cvar_string("g_ghost_items_color"));
 		e.alpha = g_ghost_items;
 		e.customizeentityforclient = func_null;