From: terencehill <piuntn@gmail.com>
Date: Sun, 4 Dec 2011 15:22:01 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/quickmenu
X-Git-Tag: xonotic-v0.8.2~1987^2~55^2~25
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e8c79ab816cecd061eec17f29d0b164bcfe7b22b;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/quickmenu
---

e8c79ab816cecd061eec17f29d0b164bcfe7b22b
diff --cc qcsrc/client/View.qc
index ee5c56e02,d9f6df7ee..66fdd710b
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@@ -445,10 -457,10 +457,10 @@@ void CSQC_UpdateView(float w, float h
  	}
  	
  	// do lockview after event chase camera so that it still applies whenever necessary.
 -	if(autocvar_cl_lockview || (autocvar__hud_configure && spectatee_status <= 0) || intermission > 1)
 +	if(autocvar_cl_lockview || (autocvar__hud_configure && spectatee_status <= 0) || intermission > 1 || HUD_QuickMenu_IsOpened())
  	{
- 		R_SetView(VF_ORIGIN, freeze_org);
- 		R_SetView(VF_ANGLES, freeze_ang);
+ 		setproperty(VF_ORIGIN, freeze_org);
+ 		setproperty(VF_ANGLES, freeze_ang);
  	}
  	else
  	{
@@@ -1410,24 -1426,21 +1426,24 @@@
  
  	if(autocvar__hud_configure)
  		HUD_Panel_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_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();
 +	}
 +
  	// let's reset the view back to normal for the end
- 	R_SetView(VF_MIN, '0 0 0');
- 	R_SetView(VF_SIZE, '1 0 0' * w + '0 1 0' * h);
+ 	setproperty(VF_MIN, '0 0 0');
+ 	setproperty(VF_SIZE, '1 0 0' * w + '0 1 0' * h);
  }