Merge remote-tracking branch 'origin/terencehill/hud_updates_bugfixes'

diff --cc qcsrc/client/hud.qc
index efa2d317beccd9bc14618a9c02c81fa589244986,fd2073c0ee26320c350a068881c59a28375a8ba2..e2cdbab6ff2a6a0a9d4aeec96e88ff8b3e471430
--- 1/qcsrc/client/hud.qc
--- 2/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@@ -444,21 -444,22 +444,22 @@@ void HUD_Weapons(void
        float timeout = autocvar_hud_panel_weapons_timeout;
        float timein_effect_length = (autocvar_hud_panel_weapons_timeout_effect ? 0.375 : 0);
        float timeout_effect_length = (autocvar_hud_panel_weapons_timeout_effect ? 0.75 : 0);
-       
+ 
        float ammo_type, ammo_full, ammo_alpha;
        float barsize_x, barsize_y, baroffset_x, baroffset_y;
-       
+ 
        float when = autocvar_hud_panel_weapons_complainbubble_time;
        float fadetime = autocvar_hud_panel_weapons_complainbubble_fadetime;
-       
+ 
        vector weapon_pos, weapon_size;
 -      vector old_panel_size;
 +      local noref vector old_panel_size; // fteqcc sucks
        vector color, ammo_color;
-       
+ 
        // check to see if we want to continue
-   if(hud != HUD_NORMAL) { return; }
-   
+       if(hud != HUD_NORMAL) { return; }
+ 
        if(!autocvar__hud_configure)
+       {
                if((!autocvar_hud_panel_weapons) || (spectatee_status == -1))
                        return;
                else if(timeout && time >= weapontime + timeout + timeout_effect_length)