From: Samual <samual@xonotic.org>
Date: Sun, 3 Jul 2011 07:53:38 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into terencehill/essential_weapons_panel
X-Git-Tag: xonotic-v0.6.0~40^2~118^2~18^2~8
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5184882771b05f1267c4a267f6298c1516cd2b0a;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/master' into terencehill/essential_weapons_panel
---

5184882771b05f1267c4a267f6298c1516cd2b0a
diff --cc qcsrc/client/hud.qc
index 3d9056789,6b1171956..7a0c1a0f8
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@@ -612,9 -612,9 +612,9 @@@ float GetAmmoTypeForWep(float i
  
  void HUD_Weapons(void)
  {
 -	float f, screen_ar;
 +	float i, f, screen_ar;
  	float center_x, center_y;
- 
+     if(hud != HUD_NORMAL) return;
  	if(!autocvar__hud_configure)
  	{
  		if(!autocvar_hud_panel_weapons) return;