From: Mario <mario.mario@y7mail.com>
Date: Wed, 18 Dec 2019 18:10:06 +0000 (+1000)
Subject: Remove cl_fullbright_items (if the server enables fullbright items, show them!)
X-Git-Tag: xonotic-v0.8.5~1206
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d764d7a3da4b1bb52406aebae463a6a9fec759fa;p=xonotic%2Fxonotic-data.pk3dir.git

Remove cl_fullbright_items (if the server enables fullbright items, show them!)
---

diff --git a/qcsrc/common/t_items.qc b/qcsrc/common/t_items.qc
index 7ef728df7..1029f7865 100644
--- a/qcsrc/common/t_items.qc
+++ b/qcsrc/common/t_items.qc
@@ -184,9 +184,8 @@ NET_HANDLE(ENT_CLIENT_ITEM, bool isnew)
 
         Item_SetAlpha(this);
 
-        if(autocvar_cl_fullbright_items)
-            if(this.ItemStatus & ITS_ALLOWFB)
-                this.effects |= EF_FULLBRIGHT;
+        if(this.ItemStatus & ITS_ALLOWFB)
+           this.effects |= EF_FULLBRIGHT;
 
         if(this.ItemStatus & ITS_GLOW)
         {
diff --git a/qcsrc/common/t_items.qh b/qcsrc/common/t_items.qh
index 5c916866f..7b0d760df 100644
--- a/qcsrc/common/t_items.qh
+++ b/qcsrc/common/t_items.qh
@@ -36,7 +36,6 @@ bool   autocvar_cl_items_nofade;
 float  autocvar_cl_animate_items = 1;
 float  autocvar_cl_ghost_items = 0.45;
 vector autocvar_cl_ghost_items_color = '-1 -1 -1';
-float  autocvar_cl_fullbright_items = 0;
 vector autocvar_cl_weapon_stay_color = '2 0.5 0.5';
 float  autocvar_cl_weapon_stay_alpha = 0.75;
 float  autocvar_cl_simple_items = 0;
diff --git a/xonotic-client.cfg b/xonotic-client.cfg
index fd56c5383..94fcdfc3e 100644
--- a/xonotic-client.cfg
+++ b/xonotic-client.cfg
@@ -857,7 +857,6 @@ seta cl_ghost_items 0.45 "enable ghosted items (when between 0 and 1, overrides
 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) - items are more visible in shadows"
 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"