Merge branch 'master' into Mario/quickmenu_merge

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / View.qc

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index 46920a4174db384323cdbf66f5119b2c1658e468..1f6880b8077d562ec46e100becdad5526f5b6b7c 100644 (file)
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -534,7 +534,7 @@ 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_cursormode && (autocvar__hud_configure && spectatee_status <= 0 || intermission > 1)))
+       if(autocvar_cl_lockview || (!autocvar_hud_cursormode && (autocvar__hud_configure && spectatee_status <= 0 || intermission > 1 || HUD_QuickMenu_IsOpened())))
        {
                setproperty(VF_ORIGIN, freeze_org);
                setproperty(VF_ANGLES, freeze_ang);
@@ -1564,23 +1564,25 @@ void CSQC_UpdateView(float w, float h)
 
        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 == 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
        setproperty(VF_MIN, '0 0 0');
        setproperty(VF_SIZE, '1 0 0' * w + '0 1 0' * h);