Disable quickmenu during mapvote screen and disable scoreboard while quickmenu is...

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index e890ad12089910f2b4f64aaa8c37e8043cc81aad..6b943b67cd5bccc04f950bce2b088c7e940be403 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -4491,6 +4491,7 @@ void HUD_QuickMenu_Close()
        HUD_QuickMenu_Buffer_Close();
 
        if(autocvar_hud_cursormode)
+       if(!mv_active)
                setcursormode(0);
 }
 
@@ -4648,7 +4649,7 @@ float HUD_QuickMenu_InputEvent(float bInputType, float nPrimary, float nSecondar
        if(bInputType == 2)
                return false;
 
-       if(!HUD_QuickMenu_IsOpened() || autocvar__hud_configure)
+       if(!HUD_QuickMenu_IsOpened() || autocvar__hud_configure || mv_active)
                return false;
 
        if(bInputType == 3)
@@ -4715,6 +4716,8 @@ float HUD_QuickMenu_InputEvent(float bInputType, float nPrimary, float nSecondar
 }
 void HUD_QuickMenu_Mouse()
 {
+       if(mv_active) return;
+
        if(!mouseClicked)
        if(prevMouseClicked & S_MOUSE2)
        {
@@ -4722,7 +4725,7 @@ void HUD_QuickMenu_Mouse()
                return;
        }
 
-       if not(autocvar_hud_cursormode)
+       if(!autocvar_hud_cursormode)
        {
                mousepos = mousepos + getmousepos() * autocvar_menu_mouse_speed;
 
@@ -4760,7 +4763,7 @@ void HUD_QuickMenu_Mouse()
                                color = '1 1 1';
                        drawfill(panel_pos, eX * panel_size_x + eY * fontsize_y, color, .2, DRAWFLAG_NORMAL);
 
-                       if(!mouseClicked && prevMouseClicked & S_MOUSE1)
+                       if(!mouseClicked && (prevMouseClicked & S_MOUSE1))
                        {
                                float f;
                                if (entry_num < QUICKMENU_MAXLINES - 1)
@@ -4799,6 +4802,7 @@ void HUD_QuickMenu(void)
                        HUD_QuickMenu_Close();
 
                if(!hud_draw_maximized) return;
+               if(mv_active) return;
                //if(!autocvar_hud_panel_quickmenu) return; // autocvar exists only for conformity with other panels
                if(!hud_panel_quickmenu) return;
        }

diff --git a/qcsrc/client/hud.qh b/qcsrc/client/hud.qh
index faae2326da8a0453feff25ccb4e2bf1f6ab0a2eb..711929066cb4cf16b08a148be392a5292e80bbf0 100644 (file)
--- a/qcsrc/client/hud.qh
+++ b/qcsrc/client/hud.qh
@@ -99,6 +99,8 @@ var string panel_bg_padding_str;
 
 float current_player;
 
+float mv_active;
+
 
 #define HUD_PANELS \
        HUD_PANEL(WEAPONS      , HUD_Weapons      , weapons) \

diff --git a/qcsrc/client/mapvoting.qc b/qcsrc/client/mapvoting.qc
index 8caeb01d524064f51c3191440555c0cd814ce0e3..75a280fe6e87cf4b882dd724602ca65d784337e4 100644 (file)
--- a/qcsrc/client/mapvoting.qc
+++ b/qcsrc/client/mapvoting.qc
@@ -1,6 +1,5 @@
 float mv_num_maps;
 
-float mv_active;
 string mv_maps[MAPVOTE_COUNT];
 string mv_pics[MAPVOTE_COUNT];
 string mv_pk3[MAPVOTE_COUNT];

diff --git a/qcsrc/client/scoreboard.qc b/qcsrc/client/scoreboard.qc
index b037d03d20cb35a4431315f87bc6ade863153b8b..055e3b5cc145e023730ec905b58037c4d7ae5e5b 100644 (file)
--- a/qcsrc/client/scoreboard.qc
+++ b/qcsrc/client/scoreboard.qc
@@ -952,6 +952,8 @@ vector HUD_Scoreboard_MakeTable(vector pos, entity tm, vector rgb, vector bg_siz
 float HUD_WouldDrawScoreboard() {
        if (autocvar__hud_configure)
                return 0;
+       else if (HUD_QuickMenu_IsOpened())
+               return 0;
        else if (scoreboard_showscores)
                return 1;
        else if (intermission == 1)