X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fmapvoting.qc;h=37cb59e082101f645ac197f6c224c12715f62bfd;hb=484c2ee83260ff5c4a0d1504573aa14befa44c70;hp=29728dfde6d07cd781c19ae75d199b038c1c1a85;hpb=387c8741f204da7abe419adbdbccccaa8110d20d;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/mapvoting.qc b/qcsrc/client/mapvoting.qc
index 29728dfde..37cb59e08 100644
--- a/qcsrc/client/mapvoting.qc
+++ b/qcsrc/client/mapvoting.qc
@@ -1,5 +1,8 @@
 #include "mapvoting.qh"
 
+#include "autocvars.qh"
+#include "miscfunctions.qh"
+#include "defs.qh"
 #include "hud/_mod.qh"
 #include "hud/panel/scoreboard.qh"
 
@@ -40,7 +43,7 @@ int n_ssdirs;
 
 string MapVote_FormatMapItem(int id, string map, float _count, float maxwidth, vector fontsize)
 {
-    TC(int, id);
+	TC(int, id);
 	string pre, post;
 	pre = sprintf("%d. ", id+1);
 	if(mv_detail)
@@ -61,7 +64,7 @@ string MapVote_FormatMapItem(int id, string map, float _count, float maxwidth, v
 
 vector MapVote_RGB(int id)
 {
-    TC(int, id);
+	TC(int, id);
 	if(!(mv_flags[id] & GTV_AVAILABLE))
 		return '1 1 1';
 	if(id == mv_ownvote)
@@ -74,7 +77,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);
+	TC(int, id);
 	// Find the correct alpha
 	float alpha;
 	if(!(mv_flags_start[id] & GTV_AVAILABLE))
@@ -186,7 +189,7 @@ void GameTypeVote_DrawGameTypeItem(vector pos, float maxh, float tsize, string g
 
 void MapVote_DrawMapItem(vector pos, float isize, float tsize, string map, string pic, float _count, int id)
 {
-    TC(int, id);
+	TC(int, id);
 	vector img_size = '0 0 0';
 	string label;
 	float text_size;
@@ -261,7 +264,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);
+	TC(int, id);
 	vector rgb;
 	float text_size;
 	string label;
@@ -278,7 +281,7 @@ void MapVote_DrawAbstain(vector pos, float isize, float tsize, float _count, int
 
 vector MapVote_GridVec(vector gridspec, int i, int m)
 {
-    TC(int, i); TC(int, m);
+	TC(int, i); TC(int, m);
 	int r = i % m;
 	return
 		'1 0 0' * (gridspec.x * r)
@@ -318,7 +321,7 @@ float MapVote_Selection(vector topleft, vector cellsize, float rows, float colum
 	return mv_mouse_selection;
 }
 
-vector HUD_GetTableSize_BestItemAR(int item_count, vector psize, float item_aspect);
+vector prev_mousepos;
 void MapVote_Draw()
 {
 	string map;
@@ -337,10 +340,11 @@ void MapVote_Draw()
 
 	if (!autocvar_hud_cursormode)
 	{
-		vector mpos = mousepos;
-		update_mousepos();
-		if (mpos.x != mousepos.x || mpos.y != mousepos.y)
+		if (mousepos.x != prev_mousepos.x || mousepos.y != prev_mousepos.y)
+		{
 			mv_selection_keyboard = 0;
+			prev_mousepos = mousepos;
+		}
 	}
 
 	center = (vid_conwidth - 1)/2;
@@ -483,18 +487,16 @@ void MapVote_Draw()
 		pos.x = (xmax+xmin)*0.5;
 		MapVote_DrawAbstain(pos, dist.x, xmax - xmin, tmp, i);
 	}
-
-	draw_cursor_normal(mousepos, '1 1 1', panel_fg_alpha);
 }
 
 void Cmd_MapVote_MapDownload(int argc)
 {
-    TC(int, argc);
+	TC(int, argc);
 	entity pak;
 
 	if(argc != 2 || !mv_pk3list)
 	{
-		LOG_INFO(_("mv_mapdownload: ^3You're not supposed to use this command on your own!\n"));
+		LOG_INFO(_("mv_mapdownload: ^3You're not supposed to use this command on your own!"));
 		return;
 	}
 
@@ -504,7 +506,7 @@ void Cmd_MapVote_MapDownload(int argc)
 			break;
 
 	if(!pak || pak.sv_entnum != id) {
-		LOG_INFO(_("^1Error:^7 Couldn't find pak index.\n"));
+		LOG_INFO(_("^1Error:^7 Couldn't find pak index."));
 		return;
 	}
 
@@ -513,14 +515,14 @@ void Cmd_MapVote_MapDownload(int argc)
 		mv_preview[id] = true;
 		return;
 	} else {
-		LOG_INFO(_("Requesting preview...\n"));
+		LOG_INFO(_("Requesting preview..."));
 		localcmd(strcat("\ncmd mv_getpicture ", ftos(id), "\n"));
 	}
 }
 
 void MapVote_CheckPK3(string pic, string pk3, int id)
 {
-    TC(int, id);
+	TC(int, id);
 	entity pak;
 	pak = spawn();
 	pak.netname = pk3;
@@ -542,7 +544,7 @@ void MapVote_CheckPK3(string pic, string pk3, int id)
 
 void MapVote_CheckPic(string pic, string pk3, int id)
 {
-    TC(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;
@@ -560,7 +562,7 @@ void MapVote_ReadMask()
 	int i;
 	if ( mv_num_maps < 24 )
 	{
-		int mask, power;
+		int mask;
 		if(mv_num_maps < 8)
 			mask = ReadByte();
 		else if(mv_num_maps < 16)
@@ -568,9 +570,9 @@ void MapVote_ReadMask()
 		else
 			mask = ReadLong();
 
-		for(i = 0, power = 1; i < mv_num_maps; ++i, power *= 2)
+		for(i = 0; i < mv_num_maps; ++i)
 		{
-			if ( mask & power )
+			if (mask & BIT(i))
 				mv_flags[i] |= GTV_AVAILABLE;
 			else
 				mv_flags[i] &= ~GTV_AVAILABLE;
@@ -585,7 +587,7 @@ void MapVote_ReadMask()
 
 void MapVote_ReadOption(int i)
 {
-    TC(int, i);
+	TC(int, i);
 	string map = strzone(ReadString());
 	string pk3 = strzone(ReadString());
 	int j = bound(0, ReadByte(), n_ssdirs - 1);
@@ -602,7 +604,7 @@ void MapVote_ReadOption(int i)
 
 void GameTypeVote_ReadOption(int i)
 {
-    TC(int, i);
+	TC(int, i);
 	string gt = strzone(ReadString());
 
 	mv_maps[i] = gt;
@@ -647,8 +649,7 @@ void GameTypeVote_ReadOption(int i)
 void MapVote_Init()
 {
 	mv_active = 1;
-	if(autocvar_hud_cursormode) setcursormode(1);
-	else mousepos = '0.5 0 0' * vid_conwidth + '0 0.5 0' * vid_conheight;
+	if(!autocvar_hud_cursormode) mousepos = '0.5 0 0' * vid_conwidth + '0 0.5 0' * vid_conheight;
 	mv_selection = -1;
 	mv_selection_keyboard = 0;
 
@@ -709,13 +710,13 @@ void MapVote_Init()
 
 void MapVote_SendChoice(int index)
 {
-    TC(int, index);
+	TC(int, index);
 	localcmd(strcat("\nimpulse ", ftos(index+1), "\n"));
 }
 
 int MapVote_MoveLeft(int pos)
 {
-    TC(int, pos);
+	TC(int, pos);
 	int imp;
 	if ( pos < 0 )
 		imp = mv_num_maps - 1;
@@ -727,7 +728,7 @@ int MapVote_MoveLeft(int pos)
 }
 int MapVote_MoveRight(int pos)
 {
-    TC(int, pos);
+	TC(int, pos);
 	int imp;
 	if ( pos < 0 )
 		imp = 0;
@@ -739,7 +740,7 @@ int MapVote_MoveRight(int pos)
 }
 int MapVote_MoveUp(int pos)
 {
-    TC(int, pos);
+	TC(int, pos);
 	int imp;
 	if ( pos < 0 )
 		imp = mv_num_maps - 1;
@@ -759,7 +760,7 @@ int MapVote_MoveUp(int pos)
 }
 int MapVote_MoveDown(int pos)
 {
-    TC(int, pos);
+	TC(int, pos);
 	int imp;
 	if ( pos < 0 )
 		imp = 0;
@@ -776,7 +777,7 @@ int MapVote_MoveDown(int pos)
 
 float MapVote_InputEvent(int bInputType, float nPrimary, float nSecondary)
 {
-    TC(int, bInputType);
+	TC(int, bInputType);
 	float imp;
 
 	if (!mv_active)