X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fmapvoting.qc;h=72b60b5bd378097c74ed43b3b754328dc0b7d435;hp=30c938aa33401debe100ee30941a2196ed04e22d;hb=c039d054a46888048d214000273ccfc63e4611b6;hpb=692cb758fe8f25fa078bfd5885333ee031885600

diff --git a/qcsrc/client/mapvoting.qc b/qcsrc/client/mapvoting.qc
index 30c938aa3..72b60b5bd 100644
--- a/qcsrc/client/mapvoting.qc
+++ b/qcsrc/client/mapvoting.qc
@@ -1,7 +1,7 @@
 #include "mapvoting.qh"
 
-#include "hud/all.qh"
-#include "scoreboard.qh"
+#include "hud/_mod.qh"
+#include "hud/panel/scoreboard.qh"
 
 #include <common/mapinfo.qh>
 
@@ -41,6 +41,7 @@ int n_ssdirs;
 
 string MapVote_FormatMapItem(int id, string map, float _count, float maxwidth, vector fontsize)
 {
+    TC(int, id);
 	string pre, post;
 	pre = sprintf("%d. ", id+1);
 	if(mv_detail)
@@ -61,6 +62,7 @@ string MapVote_FormatMapItem(int id, string map, float _count, float maxwidth, v
 
 vector MapVote_RGB(int id)
 {
+    TC(int, id);
 	if(!(mv_flags[id] & GTV_AVAILABLE))
 		return '1 1 1';
 	if(id == mv_ownvote)
@@ -73,6 +75,7 @@ vector MapVote_RGB(int id)
 
 void GameTypeVote_DrawGameTypeItem(vector pos, float maxh, float tsize, string gtype, string pic, float _count, int id)
 {
+    TC(int, id);
 	// Find the correct alpha
 	float alpha;
 	if(!(mv_flags_start[id] & GTV_AVAILABLE))
@@ -81,14 +84,15 @@ void GameTypeVote_DrawGameTypeItem(vector pos, float maxh, float tsize, string g
 		alpha = mv_top2_alpha; // Fade away if not one of the top 2 choice
 	else
 		alpha = 1; // Normal, full alpha
+	alpha *= panel_fg_alpha;
 
 	// Bounding box details
 	float rect_margin = hud_fontsize.y / 2;
 
-	pos.x += rect_margin + autocvar_scoreboard_border_thickness;
-	pos.y += rect_margin + autocvar_scoreboard_border_thickness;
-	maxh -= 2 * (rect_margin + autocvar_scoreboard_border_thickness);
-	tsize -= 2 * (rect_margin + autocvar_scoreboard_border_thickness);
+	pos.x += rect_margin + autocvar_hud_panel_mapvote_highlight_border;
+	pos.y += rect_margin + autocvar_hud_panel_mapvote_highlight_border;
+	maxh -= 2 * (rect_margin + autocvar_hud_panel_mapvote_highlight_border);
+	tsize -= 2 * (rect_margin + autocvar_hud_panel_mapvote_highlight_border);
 
 	vector rect_pos = pos - '0.5 0.5 0' * rect_margin;
 	vector rect_size = '1 1 0';
@@ -98,15 +102,15 @@ void GameTypeVote_DrawGameTypeItem(vector pos, float maxh, float tsize, string g
 	// Highlight selected item
 	if(id == mv_selection && (mv_flags[id] & GTV_AVAILABLE))
 	{
-		drawfill(rect_pos, rect_size, '1 1 1', 0.1, DRAWFLAG_NORMAL);
+		drawfill(rect_pos, rect_size, '1 1 1', 0.1 * panel_fg_alpha, DRAWFLAG_NORMAL);
 	}
 
 	// Highlight current vote
 	vector rgb = MapVote_RGB(id);
 	if(id == mv_ownvote)
 	{
-		drawfill(rect_pos, rect_size, rgb, 0.1*alpha, DRAWFLAG_NORMAL);
-		drawborderlines(autocvar_scoreboard_border_thickness, rect_pos, rect_size, rgb, alpha, DRAWFLAG_NORMAL);
+		drawfill(rect_pos, rect_size, rgb, 0.1 * alpha, DRAWFLAG_NORMAL);
+		drawborderlines(autocvar_hud_panel_mapvote_highlight_border, rect_pos, rect_size, rgb, alpha, DRAWFLAG_NORMAL);
 	}
 
 	vector offset = pos;
@@ -131,7 +135,7 @@ void GameTypeVote_DrawGameTypeItem(vector pos, float maxh, float tsize, string g
 
 	string thelabel = mv_desc[id], ts;
 	entity last = title;
-	entity next = world;
+	entity next = NULL;
 	float nlines = 0;
 	if( thelabel != "")
 	{
@@ -174,25 +178,26 @@ void GameTypeVote_DrawGameTypeItem(vector pos, float maxh, float tsize, string g
 		drawstring(last.origin+offset, last.message, gtv_text_size_small, '1 1 1', alpha, DRAWFLAG_NORMAL);
 		next = last;
 		last = last.chain;
-		remove(next);
+		delete(next);
 	}
 
 	// Cleanup
-	remove(title);
+	delete(title);
 }
 
 void MapVote_DrawMapItem(vector pos, float isize, float tsize, string map, string pic, float _count, int id)
 {
+    TC(int, id);
 	vector img_size = '0 0 0';
 	string label;
 	float text_size;
 
 	float rect_margin = hud_fontsize.y / 2;
 
-	pos.x += rect_margin + autocvar_scoreboard_border_thickness;
-	pos.y += rect_margin + autocvar_scoreboard_border_thickness;
-	isize -= 2 * (rect_margin + autocvar_scoreboard_border_thickness);
-	tsize -= 2 * (rect_margin + autocvar_scoreboard_border_thickness);
+	pos.x += rect_margin + autocvar_hud_panel_mapvote_highlight_border;
+	pos.y += rect_margin + autocvar_hud_panel_mapvote_highlight_border;
+	isize -= 2 * (rect_margin + autocvar_hud_panel_mapvote_highlight_border);
+	tsize -= 2 * (rect_margin + autocvar_hud_panel_mapvote_highlight_border);
 
 	vector rect_pos = pos - '0.5 0.5 0' * rect_margin;
 	vector rect_size = '1 1 0';
@@ -226,17 +231,18 @@ void MapVote_DrawMapItem(vector pos, float isize, float tsize, string map, strin
 		theAlpha = mv_top2_alpha;
 	else
 		theAlpha = 1;
+	theAlpha *= panel_fg_alpha;
 
 	// Highlight selected item
 	if(id == mv_selection && (mv_flags[id] & GTV_AVAILABLE))
-		drawfill(rect_pos, rect_size, '1 1 1', 0.1, DRAWFLAG_NORMAL);
+		drawfill(rect_pos, rect_size, '1 1 1', 0.1 * panel_fg_alpha, DRAWFLAG_NORMAL);
 
 	// Highlight current vote
 	vector rgb = MapVote_RGB(id);
 	if(id == mv_ownvote)
 	{
-		drawfill(rect_pos, rect_size, rgb, 0.1*theAlpha, DRAWFLAG_NORMAL);
-		drawborderlines(autocvar_scoreboard_border_thickness, rect_pos, rect_size, rgb, theAlpha, DRAWFLAG_NORMAL);
+		drawfill(rect_pos, rect_size, rgb, 0.1 * theAlpha, DRAWFLAG_NORMAL);
+		drawborderlines(autocvar_hud_panel_mapvote_highlight_border, rect_pos, rect_size, rgb, theAlpha, DRAWFLAG_NORMAL);
 	}
 
 	drawstring(text_pos, label, hud_fontsize, rgb, theAlpha, DRAWFLAG_NORMAL);
@@ -256,6 +262,7 @@ void MapVote_DrawMapItem(vector pos, float isize, float tsize, string map, strin
 
 void MapVote_DrawAbstain(vector pos, float isize, float tsize, float _count, int id)
 {
+    TC(int, id);
 	vector rgb;
 	float text_size;
 	string label;
@@ -267,11 +274,12 @@ void MapVote_DrawAbstain(vector pos, float isize, float tsize, float _count, int
 	text_size = stringwidth(label, false, hud_fontsize);
 
 	pos.x -= text_size*0.5;
-	drawstring(pos, label, hud_fontsize, rgb, 1, DRAWFLAG_NORMAL);
+	drawstring(pos, label, hud_fontsize, rgb, panel_fg_alpha, DRAWFLAG_NORMAL);
 }
 
 vector MapVote_GridVec(vector gridspec, int i, int m)
 {
+    TC(int, i); TC(int, m);
 	int r = i % m;
 	return
 		'1 0 0' * (gridspec.x * r)
@@ -326,6 +334,8 @@ void MapVote_Draw()
 	if(!mv_active)
 		return;
 
+	HUD_Panel_LoadCvars();
+
 	if (!autocvar_hud_cursormode)
 	{
 		vector mpos = mv_mousepos + getmousepos();
@@ -335,7 +345,6 @@ void MapVote_Draw()
 		if ( mpos.x != mv_mousepos.x || mpos.y != mv_mousepos.y )
 			mv_selection_keyboard = 0;
 		mv_mousepos = mpos;
-
 	}
 
 	center = (vid_conwidth - 1)/2;
@@ -354,35 +363,32 @@ void MapVote_Draw()
 	pos.y = ymin;
 	pos.z = 0;
 
+	HUD_Scale_Disable();
 	draw_beginBoldFont();
 
 	map = ((gametypevote) ? _("Decide the gametype") : _("Vote for a map"));
 	pos.x = center - stringwidth(map, false, hud_fontsize * 2) * 0.5;
-	drawstring(pos, map, hud_fontsize * 2, '1 1 1', 1, DRAWFLAG_NORMAL);
+	drawstring(pos, map, hud_fontsize * 2, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
 	pos.y += hud_fontsize.y * 2;
 
 	if( mapvote_chosenmap != "" )
 	{
 		pos.y += hud_fontsize.y * 0.25;
 		pos.x = center - stringwidth(mapvote_chosenmap, false, hud_fontsize * 1.5) * 0.5;
-		drawstring(pos, mapvote_chosenmap, hud_fontsize * 1.5, '1 1 1', 1, DRAWFLAG_NORMAL);
+		drawstring(pos, mapvote_chosenmap, hud_fontsize * 1.5, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
 		pos.y += hud_fontsize.y * 1.5;
-		pos.y += hud_fontsize.y * 0.5;
 	}
-	else
-		pos.y += hud_fontsize.y * 0.5;
+	pos.y += hud_fontsize.y * 0.5;
 
 	draw_endBoldFont();
 
 	i = ceil(max(0, mv_timeout - time));
 	map = sprintf(_("%d seconds left"), i);
 	pos.x = center - stringwidth(map, false, hud_fontsize * 1.5) * 0.5;
-	drawstring(pos, map, hud_fontsize * 1.5, '0 1 0', 1, DRAWFLAG_NORMAL);
+	drawstring(pos, map, hud_fontsize * 1.5, '0 1 0', panel_fg_alpha, DRAWFLAG_NORMAL);
 	pos.y += hud_fontsize.y * 1.5;
 	pos.y += hud_fontsize.y * 0.5;
 
-	HUD_Panel_UpdateCvars();
-
 	// base for multi-column stuff...
 	pos.y += hud_fontsize.y;
 	pos.x = xmin;
@@ -436,7 +442,7 @@ void MapVote_Draw()
 	panel_pos.y = pos.y;
 	panel_size.x = xmax - xmin;
 	panel_size.y = ymax - ymin;
-	HUD_Panel_DrawBg(1);
+	HUD_Panel_DrawBg();
 
 	if(panel_bg_padding)
 	{
@@ -482,11 +488,12 @@ void MapVote_Draw()
 		MapVote_DrawAbstain(pos, dist.x, xmax - xmin, tmp, i);
 	}
 
-	drawpic(mv_mousepos, strcat("gfx/menu/", autocvar_menu_skin, "/cursor.tga"), '32 32 0', '1 1 1', 1 - autocvar__menu_alpha, DRAWFLAG_NORMAL);
+	draw_cursor_normal(mv_mousepos, '1 1 1', panel_fg_alpha);
 }
 
-void Cmd_MapVote_MapDownload(float argc)
+void Cmd_MapVote_MapDownload(int argc)
 {
+    TC(int, argc);
 	entity pak;
 
 	if(argc != 2 || !mv_pk3list)
@@ -517,6 +524,7 @@ void Cmd_MapVote_MapDownload(float argc)
 
 void MapVote_CheckPK3(string pic, string pk3, int id)
 {
+    TC(int, id);
 	entity pak;
 	pak = spawn();
 	pak.netname = pk3;
@@ -538,6 +546,7 @@ void MapVote_CheckPK3(string pic, string pk3, int id)
 
 void MapVote_CheckPic(string pic, string pk3, int id)
 {
+    TC(int, id);
 	// never try to retrieve a pic for the "don't care" 'map'
 	if(mv_abstain && id == mv_num_maps - 1)
 		return;
@@ -580,6 +589,7 @@ void MapVote_ReadMask()
 
 void MapVote_ReadOption(int i)
 {
+    TC(int, i);
 	string map = strzone(ReadString());
 	string pk3 = strzone(ReadString());
 	int j = bound(0, ReadByte(), n_ssdirs - 1);
@@ -596,6 +606,7 @@ void MapVote_ReadOption(int i)
 
 void GameTypeVote_ReadOption(int i)
 {
+    TC(int, i);
 	string gt = strzone(ReadString());
 
 	mv_maps[i] = gt;
@@ -618,7 +629,7 @@ void GameTypeVote_ReadOption(int i)
 	}
 	else
 	{
-		int type = MapInfo_Type_FromString(gt);
+		Gametype type = MapInfo_Type_FromString(gt);
 		mv_pk3[i] = strzone(MapInfo_Type_ToText(type));
 		mv_desc[i] = MapInfo_Type_Description(type);
 	}
@@ -669,8 +680,8 @@ void MapVote_Init()
 	for(i = 0; i < mv_num_maps; ++i )
 		mv_flags_start[i] = mv_flags[i];
 
-	// Assume mv_pk3list is world, there should only be 1 mapvote per round
-	mv_pk3list = world; // I'm still paranoid!
+	// Assume mv_pk3list is NULL, there should only be 1 mapvote per round
+	mv_pk3list = NULL; // I'm still paranoid!
 
 	for(i = 0; i < mv_num_maps; ++i)
 	{
@@ -687,13 +698,15 @@ void MapVote_Init()
 	n_ssdirs = 0;
 }
 
-void MapVote_SendChoice(float index)
+void MapVote_SendChoice(int index)
 {
+    TC(int, index);
 	localcmd(strcat("\nimpulse ", ftos(index+1), "\n"));
 }
 
 int MapVote_MoveLeft(int pos)
 {
+    TC(int, pos);
 	int imp;
 	if ( pos < 0 )
 		imp = mv_num_maps - 1;
@@ -705,6 +718,7 @@ int MapVote_MoveLeft(int pos)
 }
 int MapVote_MoveRight(int pos)
 {
+    TC(int, pos);
 	int imp;
 	if ( pos < 0 )
 		imp = 0;
@@ -716,6 +730,7 @@ int MapVote_MoveRight(int pos)
 }
 int MapVote_MoveUp(int pos)
 {
+    TC(int, pos);
 	int imp;
 	if ( pos < 0 )
 		imp = mv_num_maps - 1;
@@ -735,6 +750,7 @@ int MapVote_MoveUp(int pos)
 }
 int MapVote_MoveDown(int pos)
 {
+    TC(int, pos);
 	int imp;
 	if ( pos < 0 )
 		imp = 0;
@@ -749,8 +765,9 @@ int MapVote_MoveDown(int pos)
 	return imp;
 }
 
-float MapVote_InputEvent(float bInputType, float nPrimary, float nSecondary)
+float MapVote_InputEvent(int bInputType, float nPrimary, float nSecondary)
 {
+    TC(int, bInputType);
 	float imp;
 
 	if (!mv_active)