From: terencehill <piuntn@gmail.com>
Date: Sun, 6 Mar 2011 14:31:50 +0000 (+0100)
Subject: g_ghost_items_color must not be used when g_ghost_items is disabled and the item... 
X-Git-Tag: xonotic-v0.5.0~309^2~11^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8b7bf817210a7a6d3043c638ccbe5873b9356cf5;p=xonotic%2Fxonotic-data.pk3dir.git

g_ghost_items_color must not be used when g_ghost_items is disabled and the item isn't visible anyway
Also updated comments
---

diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index 5cd714b65..ce2813de5 100644
--- a/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@ -96,7 +96,7 @@ void Item_Show (entity e, float mode)
 	}
 	else if((e.flags & FL_WEAPON) && (g_weapon_stay == 3))
 	{
-		// make the item translucent green and not touchable
+		// make the item translucent and not touchable
 		e.model = e.mdl;
 		e.solid = SOLID_TRIGGER; // can STILL be picked up!
 		e.colormod = '0 0 0';
@@ -108,7 +108,7 @@ void Item_Show (entity e, float mode)
 	}
 	else if(g_ghost_items)
 	{
-		// make the item translucent green and not touchable
+		// make the item translucent and not touchable
 		e.model = e.mdl;
 		e.solid = SOLID_NOT;
 		e.colormod = stov(autocvar_g_ghost_items_color);
@@ -123,7 +123,7 @@ void Item_Show (entity e, float mode)
 		// hide the item completely
 		e.model = string_null;
 		e.solid = SOLID_NOT;
-		e.colormod = stov(autocvar_g_ghost_items_color);
+		e.colormod = '0 0 0';
 		e.glowmod = e.colormod;
 		e.alpha = 0;
 		e.customizeentityforclient = func_null;