From: terencehill <piuntn@gmail.com>
Date: Wed, 30 May 2018 12:22:26 +0000 (+0200)
Subject: cl_ghost_items cvar now really leaves the color unchanged if set to "0 0 0" (like... 
X-Git-Tag: xonotic-v0.8.5~2122
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=684121ec9f5723acbb474f8340ab0613aa3c36f2;p=xonotic%2Fxonotic-data.pk3dir.git

cl_ghost_items cvar now really leaves the color unchanged if set to "0 0 0" (like the description says); improve description of cl_ghost_items_color and cl_weapon_stay_color cvars
---

diff --git a/qcsrc/common/t_items.qc b/qcsrc/common/t_items.qc
index 039d27da3..37a29f101 100644
--- a/qcsrc/common/t_items.qc
+++ b/qcsrc/common/t_items.qc
@@ -50,13 +50,8 @@ void Item_SetAlpha(entity this)
 	}
 	else
 	{
-		if (autocvar_cl_ghost_items_color)
-		{
-			this.alpha = autocvar_cl_ghost_items;
-			this.colormod = this.glowmod = autocvar_cl_ghost_items_color;
-		}
-		else
-			this.alpha = -1;
+		this.alpha = autocvar_cl_ghost_items;
+		this.colormod = this.glowmod = autocvar_cl_ghost_items_color;
 	}
 
 	if((!veh_hud) && (this.ItemStatus & ITS_STAYWEP))
diff --git a/xonotic-client.cfg b/xonotic-client.cfg
index 164c40840..32ef34a4d 100644
--- a/xonotic-client.cfg
+++ b/xonotic-client.cfg
@@ -833,11 +833,11 @@ alias menu_sync "menu_cmd sync"
 seta cl_items_nofade 0
 seta cl_animate_items 1
 seta cl_ghost_items 0.45 "enable ghosted items (when between 0 and 1, overrides the alpha value)"
-seta cl_ghost_items_color "-1 -1 -1" "color of ghosted items, 0 0 0 leaves the color unchanged"
+seta cl_ghost_items_color "-1 -1 -1" "color of ghosted items (colormod format: 0 0 0 leaves the color unchanged, negative values allowed)"
 seta cl_simple_items 0 "enable simple items (if server allows)"
 set cl_simpleitems_postfix "_luma" "posfix to add fo model name when simple items are enabled"
 set cl_fullbright_items 0 "enable fullbright items (if server allows, controlled by g_fullbrightitems)"
-set cl_weapon_stay_color "2 0.5 0.5" "Color of picked up weapons when g_weapon_stay > 0"
+set cl_weapon_stay_color "2 0.5 0.5" "Color of picked up weapons when g_weapon_stay > 0 (colormod format: 0 0 0 leaves the color unchanged, negative values allowed)"
 set cl_weapon_stay_alpha 0.75 "Alpha of picked up weapons when g_weapon_stay > 0"
 
 seta cl_showspectators 0 "Show who's spectating you if server has sv_showspectators enabled"