Merge branch 'master' into z411/bai-server

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / hud / panel / weapons.qc

diff --git a/qcsrc/client/hud/panel/weapons.qc b/qcsrc/client/hud/panel/weapons.qc
index dde130da8a2b94420007d646c839e8243c44de38..7dde9194256226d5f432b39fcacd9886a4e41316 100644 (file)
--- a/qcsrc/client/hud/panel/weapons.qc
+++ b/qcsrc/client/hud/panel/weapons.qc
@@ -118,6 +118,8 @@ string cl_weaponpriority_old;
 bool weapons_orderbyimpulse_old;
 void HUD_Weapons()
 {
+       if(spectatee_status && teamplay) return; // z411
+       
        // declarations
        WepSet weapons_stat = WepSet_GetFromStat();
        int i;
@@ -523,7 +525,7 @@ void HUD_Weapons()
                }
 
                // draw the weapon accuracy
-               if(autocvar_hud_panel_weapons_accuracy)
+               /* z411 if(autocvar_hud_panel_weapons_accuracy)
                {
                        float panel_weapon_accuracy = weapon_accuracy[it.m_id-WEP_FIRST];
                        if(panel_weapon_accuracy >= 0)
@@ -531,7 +533,7 @@ void HUD_Weapons()
                                color = Accuracy_GetColor(panel_weapon_accuracy);
                                drawpic_aspect_skin(weapon_pos, "weapon_accuracy", weapon_size, color, panel_fg_alpha, DRAWFLAG_NORMAL);
                        }
-               }
+               }*/
 
                vector weapon_size_real = noncurrent_size;
                float weapon_alpha_real = noncurrent_alpha;