From: Mario <mario.mario@y7mail.com>
Date: Fri, 8 Nov 2013 08:33:49 +0000 (+1100)
Subject: Merge branch 'master' into Mario/quickmenu_merge
X-Git-Tag: xonotic-v0.8.2~1987^2~55^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=14795863ffe0b7c2859794da85ae3b885b21d159;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/quickmenu_merge
---

14795863ffe0b7c2859794da85ae3b885b21d159
diff --cc qcsrc/client/View.qc
index 1f6880b80,8c9d59dd9..d20619dc7
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@@ -1564,23 -1564,21 +1564,9 @@@ void CSQC_UpdateView(float w, float h
  
  	if(autocvar__hud_configure)
  		HUD_Panel_Mouse();
- 	else if (HUD_QuickMenu_IsOpened())
 -
 -    if(hud && !intermission)
 -    {
 -        if(hud == HUD_SPIDERBOT)
 -            CSQC_SPIDER_HUD();
 -        else if(hud == HUD_WAKIZASHI)
 -            CSQC_WAKIZASHI_HUD();
 -        else if(hud == HUD_RAPTOR)
 -            CSQC_RAPTOR_HUD();
 -        else if(hud == HUD_BUMBLEBEE)
 -            CSQC_BUMBLE_HUD();
 -        else if(hud == HUD_BUMBLEBEE_GUN)
 -            CSQC_BUMBLE_GUN_HUD();
 -    }
++	else if(HUD_QuickMenu_IsOpened())
 +		HUD_QuickMenu_Mouse();
  
- 	if(hud && !intermission)
- 	{
- 		if(hud == HUD_SPIDERBOT)
- 			CSQC_SPIDER_HUD();
- 		else if(hud == HUD_WAKIZASHI)
- 			CSQC_WAKIZASHI_HUD();
- 		else if(hud == HUD_RAPTOR)
- 			CSQC_RAPTOR_HUD();
- 		else if(hud == HUD_BUMBLEBEE)
- 			CSQC_BUMBLE_HUD();
- 		else if(hud == HUD_BUMBLEBEE_GUN)
- 			CSQC_BUMBLE_GUN_HUD();
- 	}
- 
  	cl_notice_run();
  
  	// let's reset the view back to normal for the end
diff --cc qcsrc/client/autocvars.qh
index 21ac57b46,403792020..32641494b
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@@ -338,10 -337,8 +338,10 @@@ float autocvar_hud_panel_weapons_timeou
  float autocvar_hud_panel_weapons_timeout_effect;
  float autocvar_hud_panel_weapons_timeout_fadebgmin;
  float autocvar_hud_panel_weapons_timeout_fadefgmin;
- var float autocvar_hud_panel_weapons_timeout_speed_in = 0.25; 
+ var float autocvar_hud_panel_weapons_timeout_speed_in = 0.25;
  var float autocvar_hud_panel_weapons_timeout_speed_out = 0.75;
 +//float autocvar_hud_panel_quickmenu;
 +float autocvar_hud_panel_quickmenu_align;
  float autocvar_hud_progressbar_alpha;
  float autocvar_hud_showbinds;
  float autocvar_hud_showbinds_limit;