X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud%2Fpanel%2Fvote.qc;h=0337eccfc215cac966713dd4602018548129b935;hb=16e64ff58cf65d7b3e0815aadb530580a6aa251b;hp=7614eefcc0dbe71c465c71852f7fc21cd3a19680;hpb=06bf8b3259ecb57a7264e04deeb1b1f3656b87fd;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/hud/panel/vote.qc b/qcsrc/client/hud/panel/vote.qc
index 7614eefcc..0337eccfc 100644
--- a/qcsrc/client/hud/panel/vote.qc
+++ b/qcsrc/client/hud/panel/vote.qc
@@ -1,12 +1,15 @@
 #include "vote.qh"
 
+#include <client/autocvars.qh>
+#include <client/defs.qh>
+#include <client/miscfunctions.qh>
 #include <common/mapinfo.qh>
 
 // Vote (#9)
 
 void HUD_Vote()
 {
-	if(autocvar_cl_allow_uid2name == -1 && (gametype == MAPINFO_TYPE_CTS || gametype == MAPINFO_TYPE_RACE || (serverflags & SERVERFLAG_PLAYERSTATS)))
+	if(autocvar_cl_allow_uid2name == -1 && (ISGAMETYPE(CTS) || ISGAMETYPE(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
@@ -21,18 +24,22 @@ void HUD_Vote()
 		{
 			vote_yescount = 0;
 			vote_nocount = 0;
-			LOG_INFO(_("^1You must answer before entering hud configure mode\n"));
+			LOG_INFO(_("^1You must answer before entering hud configure mode"));
 			cvar_set("_hud_configure", "0");
 		}
-		if(vote_called_vote)
-			strunzone(vote_called_vote);
-		vote_called_vote = strzone(_("^2Name ^7instead of \"^1Anonymous player^7\" in stats"));
+		strcpy(vote_called_vote, _("^2Name ^7instead of \"^1Anonymous player^7\" in stats"));
 		uid2name_dialog = 1;
 	}
 
 	if(!autocvar__hud_configure)
 	{
 		if(!autocvar_hud_panel_vote) return;
+		/*
+		if(cvar("hud_panel_vote_test")) {
+			if(vote_called_vote) strunzone(vote_called_vote); vote_called_vote = strzone("^1test the vote panel");
+			vote_active = true; vote_yescount = 3; vote_nocount = 2; vote_needed = 4;
+		} else vote_active = false;
+		*/
 	}
 	else
 	{
@@ -48,13 +55,6 @@ void HUD_Vote()
 		vote_prev = vote_active;
 	}
 
-	/*
-	if(cvar("hud_panel_vote_test")) {
-		if(vote_called_vote) strunzone(vote_called_vote); vote_called_vote = strzone("^1test the vote panel");
-		vote_active = true; vote_yescount = 3; vote_nocount = 2; vote_needed = 4;
-	} else vote_active = false;
-	*/
-
 	if(vote_active || autocvar__hud_configure)
 		vote_alpha = bound(0, (time - vote_change) * 2, 1);
 	else
@@ -75,8 +75,8 @@ void HUD_Vote()
 
 	if(uid2name_dialog)
 	{
-		panel_pos = eX * 0.3 * vid_conwidth + eY * 0.1 * vid_conheight;
-		panel_size = eX * 0.4 * vid_conwidth + eY * 0.3 * vid_conheight;
+		panel_pos = vec2(0.3 * vid_conwidth, 0.1 * vid_conheight);
+		panel_size = vec2(0.4 * vid_conwidth, 0.3 * vid_conheight);
 	}
 
 	vector pos, mySize;
@@ -116,20 +116,20 @@ void HUD_Vote()
 	s = _("A vote has been called for:");
 	if(uid2name_dialog)
 		s = _("Allow servers to store and display your name?");
-	drawstring_aspect(pos, s, eX * mySize.x + eY * (2/8) * mySize.y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-	s = textShortenToWidth(vote_called_vote, mySize.x, '1 1 0' * mySize.y * (1/8), stringwidth_colors);
+	drawstring_aspect(pos, s, vec2(mySize.x, (2/8) * mySize.y), '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+	s = textShortenToWidth(ColorTranslateRGB(vote_called_vote), mySize.x, '1 1 0' * mySize.y * (1/8), stringwidth_colors);
 	if(autocvar__hud_configure)
 		s = _("^1Configure the HUD");
-	drawcolorcodedstring_aspect(pos + eY * (2/8) * mySize.y, s, eX * mySize.x + eY * (1.75/8) * mySize.y, panel_fg_alpha, DRAWFLAG_NORMAL);
+	drawcolorcodedstring_aspect(pos + eY * (2/8) * mySize.y, s, vec2(mySize.x, (1.75/8) * mySize.y), panel_fg_alpha, DRAWFLAG_NORMAL);
 
 	// print the yes/no counts
 	s = sprintf("^2%s ^7(%d)", getcommandkey_forcename(_("Yes"), "vyes"), vote_yescount);
-	drawcolorcodedstring_aspect(pos + eY * (4/8) * mySize.y, s, eX * 0.5 * mySize.x + eY * (1.5/8) * mySize.y, panel_fg_alpha, DRAWFLAG_NORMAL);
+	drawcolorcodedstring_aspect(pos + eY * (4/8) * mySize.y, s, vec2(0.5 * mySize.x, (1.5/8) * mySize.y), panel_fg_alpha, DRAWFLAG_NORMAL);
 	s = sprintf("^1%s ^7(%d)", getcommandkey_forcename(_("No"), "vno"), vote_nocount);
-	drawcolorcodedstring_aspect(pos + eX * 0.5 * mySize.x + eY * (4/8) * mySize.y, s, eX * 0.5 * mySize.x + eY * (1.5/8) * mySize.y, panel_fg_alpha, DRAWFLAG_NORMAL);
+	drawcolorcodedstring_aspect(pos + vec2(0.5 * mySize.x, (4/8) * mySize.y), s, vec2(0.5 * mySize.x, (1.5/8) * mySize.y), panel_fg_alpha, DRAWFLAG_NORMAL);
 
 	pos.y += (5/8) * mySize.y;
-	vector tmp_size = eX * mySize.x + eY * (3/8) * mySize.y;
+	vector tmp_size = vec2(mySize.x, (3/8) * mySize.y);
 	// draw the progress bar backgrounds
 	drawpic_skin(pos, "voteprogress_back", tmp_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);