X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud%2Fpanel%2Fvote.qc;h=d7d4d252bec67441f178311e5f593bde24220536;hb=05ee5b1212a6537e5c5acb76dbc1ef9df40f85c6;hp=8968a6f349484bcb64c3f7d689e54f4d1958e094;hpb=834fed09016056ff2cd32d1980f0719d09c403a2;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/hud/panel/vote.qc b/qcsrc/client/hud/panel/vote.qc
index 8968a6f34..d7d4d252b 100644
--- a/qcsrc/client/hud/panel/vote.qc
+++ b/qcsrc/client/hud/panel/vote.qc
@@ -7,6 +7,15 @@ void HUD_Vote()
 {
 	if(autocvar_cl_allow_uid2name == -1 && (gametype == MAPINFO_TYPE_CTS || gametype == MAPINFO_TYPE_RACE || (serverflags & SERVERFLAG_PLAYERSTATS)))
 	{
+		// this dialog gets overriden by the uid2name menu dialog, if it exists
+		// TODO remove this client side uid2name dialog in the next release
+		if(autocvar__menu_alpha)
+			hud_fade_alpha = 0;
+		else
+			uid2name_dialog = 0;
+		if (!uid2name_dialog)
+			localcmd("menu_cmd directmenu Uid2Name\n");
+
 		vote_active = 1;
 		if (autocvar__hud_configure)
 		{
@@ -69,7 +78,10 @@ void HUD_Vote()
 	mySize = panel_size;
 
 	a = vote_alpha * (vote_highlighted ? autocvar_hud_panel_vote_alreadyvoted_alpha : 1);
-	HUD_Scale_Enable();
+	if (autocvar_hud_panel_vote_dynamichud)
+		HUD_Scale_Enable();
+	else
+		HUD_Scale_Disable();
 	HUD_Panel_DrawBg(a);
 	a = panel_fg_alpha * a;