From 21f5911f73acf42ff7e13b17d923112a63ca51ea Mon Sep 17 00:00:00 2001 From: fruitiex Date: Sat, 13 Feb 2010 22:58:42 +0000 Subject: [PATCH] Taoki's hologram items patch git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8646 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/defaultNexuiz.cfg | 3 ++- data/qcsrc/server/miscfunctions.qc | 2 +- data/qcsrc/server/t_items.qc | 6 ++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/data/defaultNexuiz.cfg b/data/defaultNexuiz.cfg index 95344e0aa..ffdbdf917 100644 --- a/data/defaultNexuiz.cfg +++ b/data/defaultNexuiz.cfg @@ -1716,7 +1716,8 @@ set g_triggerimpulse_accel_multiplier 1 "trigger_impulse accelerator multiplier 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" diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc index b15371287..0790d18c6 100644 --- a/data/qcsrc/server/miscfunctions.qc +++ b/data/qcsrc/server/miscfunctions.qc @@ -1322,7 +1322,7 @@ void readlevelcvars(void) 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"); diff --git a/data/qcsrc/server/t_items.qc b/data/qcsrc/server/t_items.qc index a1ec70f69..b2567229d 100644 --- a/data/qcsrc/server/t_items.qc +++ b/data/qcsrc/server/t_items.qc @@ -47,6 +47,7 @@ float Item_Customize() 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 @@ float Item_Customize() { 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 @@ void Item_Show (entity e, float mode) // 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 @@ void Item_Show (entity e, float mode) // 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; -- 2.39.2