From: mand1nga <mand1nga@xonotic.org>
Date: Sun, 4 Dec 2011 12:45:38 +0000 (-0300)
Subject: Merge remote-tracking branch 'origin/terencehill/hud_updates_bugfixes'
X-Git-Tag: xonotic-v0.6.0~35^2~21
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=88323e586852adfa78a5761f71ac88f5ae0bfce6;p=xonotic%2Fxonotic-data.pk3dir.git

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

88323e586852adfa78a5761f71ac88f5ae0bfce6
diff --cc qcsrc/client/hud.qc
index efa2d317b,fd2073c0e..e2cdbab6f
--- a/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)