X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fmapvoting.qc;h=4d96d5821ca3e6796aa244bad0a5d39697674701;hb=755350c0157d5ee6b65dfb211180c7f9df20e977;hp=7c3bcecc50d22be197f696b15a60b05036dd466f;hpb=72fd26e05143a2e69e55239e6972bcf3cba86ba7;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/mapvoting.qc b/qcsrc/client/mapvoting.qc
index 7c3bcecc5..4d96d5821 100644
--- a/qcsrc/client/mapvoting.qc
+++ b/qcsrc/client/mapvoting.qc
@@ -58,7 +58,6 @@ void MapVote_DrawMapItem(vector pos, float isize, float tsize, string map, strin
 	img_size_y = isize;
 	img_size_x = isize / 0.75; // 4:3 x can be stretched easily, height is defined in isize
 
-	drawfont = hud_font;
 	pos_y = pos_y + img_size_y;
 	
 	label = MapVote_FormatMapItem(id, map, count, tsize, hud_fontsize);
@@ -71,8 +70,8 @@ void MapVote_DrawMapItem(vector pos, float isize, float tsize, string map, strin
 	pos_x = pos_x + text_size*0.5 - img_size_x*0.5;
 	pos_y = pos_y - img_size_y;
 
-	pos += hud_border_thickness * '1 1 0';
-	img_size -= (hud_border_thickness * 2) * '1 1 0';
+	pos += autocvar_scoreboard_border_thickness * '1 1 0';
+	img_size -= (autocvar_scoreboard_border_thickness * 2) * '1 1 0';
 	if(pic == "")
 	{
 		drawfill(pos, img_size, '.5 .5 .5', .7, DRAWFLAG_NORMAL);
@@ -81,19 +80,14 @@ void MapVote_DrawMapItem(vector pos, float isize, float tsize, string map, strin
 	{
 		drawpic(pos, pic, img_size, '1 1 1', 1, DRAWFLAG_NORMAL);
 	}
-	
-	drawpic(pos + '1 0 0', strcat("gfx/hud/num_", ftos(id+1)), (img_size_y / 5) * '1 1 0', '1 1 1', 0.6, DRAWFLAG_NORMAL);
 
-	if(id == mv_ownvote || pic == "")
-	{
-		drawborderlines(hud_border_thickness, pos, img_size, rgb, 1, DRAWFLAG_NORMAL);
-		drawpic(pos + '1 0 0', strcat("gfx/hud/num_", ftos(id+1)), (img_size_y / 5) * '1 1 0', rgb, 0.6, DRAWFLAG_NORMAL);
-	}
+	if(id == mv_ownvote)
+		drawborderlines(autocvar_scoreboard_border_thickness, pos, img_size, rgb, 1, DRAWFLAG_NORMAL);
 	else
-	{
-		drawborderlines(hud_border_thickness, pos, img_size, '0 0 0', 1, DRAWFLAG_NORMAL);
-		drawpic(pos + '1 0 0', strcat("gfx/hud/num_", ftos(id+1)), (img_size_y / 5) * '1 1 0', '1 1 1', 0.6, DRAWFLAG_NORMAL);
-	}
+		drawborderlines(autocvar_scoreboard_border_thickness, pos, img_size, '0 0 0', 1, DRAWFLAG_NORMAL);
+
+	if(id == mv_selection)
+		drawfill(pos, img_size, '1 1 1', 0.1, DRAWFLAG_NORMAL);
 }
 
 void MapVote_DrawAbstain(vector pos, float isize, float tsize, float count, float id)
@@ -104,7 +98,6 @@ void MapVote_DrawAbstain(vector pos, float isize, float tsize, float count, floa
 	
 	rgb = MapVote_RGB(id);
 
-	drawfont = hud_font;
 	pos_y = pos_y + hud_fontsize_y;
 	
 	label = MapVote_FormatMapItem(id, "Don't care", count, tsize, hud_fontsize);
@@ -177,13 +170,12 @@ void MapVote_Draw()
 	xmin = vid_conwidth*0.05; // 5% border must suffice
 	xmax = vid_conwidth - xmin;
 	ymin = 20;
-	i = cvar("con_chatpos"); //*cvar("con_chatsize");
+	i = autocvar_con_chatpos; //*autocvar_con_chatsize;
 	if(i < 0)
-		ymax = vid_conheight + (i - cvar("con_chat")) * cvar("con_chatsize");
+		ymax = vid_conheight + (i - autocvar_con_chat) * autocvar_con_chatsize;
 	if(i >= 0 || ymax < (vid_conheight*0.5))
 		ymax = vid_conheight - ymin;
 
-	drawfont = hud_bigfont;
 	hud_fontsize = HUD_GetFontsize("hud_fontsize");
 
 	pos_y = ymin;
@@ -201,8 +193,6 @@ void MapVote_Draw()
 	pos_y += 22;
 	pos_x = xmin;
 
-	drawfont = hud_font;
-	
 	// base for multi-column stuff...
 	ymin = pos_y;
 	if(mv_abstain)
@@ -249,7 +239,7 @@ void MapVote_Draw()
 		MapVote_DrawAbstain(pos, isize, xmax - xmin, tmp, i);
 	}
 
-	drawpic(mv_mousepos, strcat("gfx/menu/", cvar_string("menu_skin"), "/cursor.tga"), '32 32 0', '1 1 1', autocvar_hud_panel_fg_alpha, DRAWFLAG_NORMAL);
+	drawpic(mv_mousepos, strcat("gfx/menu/", autocvar_menu_skin, "/cursor.tga"), '32 32 0', '1 1 1', autocvar_hud_panel_fg_alpha, DRAWFLAG_NORMAL);
 }
 
 void Cmd_MapVote_MapDownload(float argc)