X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fmapvoting.qc;h=d0bab24b56d2d1918da0a132275efdd143e348bf;hb=a1cc887b24a88d0686c7d267e1d0d196421fcd65;hp=37cb59e082101f645ac197f6c224c12715f62bfd;hpb=16e64ff58cf65d7b3e0815aadb530580a6aa251b;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/mapvoting.qc b/qcsrc/client/mapvoting.qc
index 37cb59e08..d0bab24b5 100644
--- a/qcsrc/client/mapvoting.qc
+++ b/qcsrc/client/mapvoting.qc
@@ -322,6 +322,7 @@ float MapVote_Selection(vector topleft, vector cellsize, float rows, float colum
 }
 
 vector prev_mousepos;
+// draws map vote or gametype vote
 void MapVote_Draw()
 {
 	string map;
@@ -359,6 +360,11 @@ void MapVote_Draw()
 		ymax -= chat_sizey;
 
 	hud_fontsize = HUD_GetFontsize("hud_fontsize");
+	if (gametypevote)
+	{
+		gtv_text_size = hud_fontsize * 1.4;
+		gtv_text_size_small = hud_fontsize * 1.1;
+	}
 
 	pos.y = ymin;
 	pos.z = 0;
@@ -459,7 +465,7 @@ void MapVote_Draw()
 	mv_selection = MapVote_Selection(pos, dist, rows, mv_columns);
 
 	if (mv_top2_time)
-		mv_top2_alpha = max(0.2, 1 - (time - mv_top2_time)*(time - mv_top2_time));
+		mv_top2_alpha = max(0.2, 1 - (time - mv_top2_time) ** 2);
 
 	void (vector, float, float, string, string, float, float) DrawItem;
 
@@ -680,9 +686,6 @@ void MapVote_Init()
 		mapvote_chosenmap = strzone(ReadString());
 		if ( gametypevote == 2 )
 			gametypevote = 0;
-
-		gtv_text_size = hud_fontsize*1.4;
-		gtv_text_size_small = hud_fontsize*1.1;
 	}
 
 	MapVote_ReadMask();
@@ -778,8 +781,8 @@ int MapVote_MoveDown(int pos)
 float MapVote_InputEvent(int bInputType, float nPrimary, float nSecondary)
 {
 	TC(int, bInputType);
-	float imp;
 
+	static int first_digit = 0;
 	if (!mv_active)
 		return false;
 
@@ -791,29 +794,28 @@ float MapVote_InputEvent(int bInputType, float nPrimary, float nSecondary)
 		return true;
 	}
 
+	if (bInputType == 0)
+	{
+		if (nPrimary == K_ALT) hudShiftState |= S_ALT;
+		if (nPrimary == K_CTRL) hudShiftState |= S_CTRL;
+		if (nPrimary == K_SHIFT) hudShiftState |= S_SHIFT;
+	}
+	else if (bInputType == 1)
+	{
+		if (nPrimary == K_ALT) hudShiftState -= (hudShiftState & S_ALT);
+		if (nPrimary == K_CTRL) hudShiftState -= (hudShiftState & S_CTRL);
+		if (nPrimary == K_SHIFT) hudShiftState -= (hudShiftState & S_SHIFT);
+
+		if (nPrimary == K_CTRL)
+			first_digit = 0;
+	}
+
 	if (bInputType != 0)
 		return false;
 
-	if ('0' <= nPrimary && nPrimary <= '9')
-	{
-		imp = nPrimary - '0';
-		if (imp == 0) imp = 10;
-		localcmd(strcat("\nimpulse ", ftos(imp), "\n"));
-		return true;
-	}
+	int imp = 0;
 	switch(nPrimary)
 	{
-		case K_KP_1: localcmd("\nimpulse 1\n"); return true;
-		case K_KP_2: localcmd("\nimpulse 2\n"); return true;
-		case K_KP_3: localcmd("\nimpulse 3\n"); return true;
-		case K_KP_4: localcmd("\nimpulse 4\n"); return true;
-		case K_KP_5: localcmd("\nimpulse 5\n"); return true;
-		case K_KP_6: localcmd("\nimpulse 6\n"); return true;
-		case K_KP_7: localcmd("\nimpulse 7\n"); return true;
-		case K_KP_8: localcmd("\nimpulse 8\n"); return true;
-		case K_KP_9: localcmd("\nimpulse 9\n"); return true;
-		case K_KP_0: localcmd("\nimpulse 10\n"); return true;
-
 		case K_RIGHTARROW:
 			mv_selection_keyboard = 1;
 			mv_selection = MapVote_MoveRight(mv_selection);
@@ -836,6 +838,27 @@ float MapVote_InputEvent(int bInputType, float nPrimary, float nSecondary)
 			if ( mv_selection_keyboard )
 				MapVote_SendChoice(mv_selection);
 			return true;
+		case '1': case K_KP_1: imp = 1; break;
+		case '2': case K_KP_2: imp = 2; break;
+		case '3': case K_KP_3: imp = 3; break;
+		case '4': case K_KP_4: imp = 4; break;
+		case '5': case K_KP_5: imp = 5; break;
+		case '6': case K_KP_6: imp = 6; break;
+		case '7': case K_KP_7: imp = 7; break;
+		case '8': case K_KP_8: imp = 8; break;
+		case '9': case K_KP_9: imp = 9; break;
+		case '0': case K_KP_0: imp = 10; break;
+	}
+
+	if (imp && hudShiftState & S_CTRL)
+	{
+		if (!first_digit)
+		{
+			first_digit = imp % 10;
+			return true;
+		}
+		else
+			imp = first_digit * 10 + (imp % 10);
 	}
 
 	if (nPrimary == K_MOUSE1)
@@ -843,11 +866,14 @@ float MapVote_InputEvent(int bInputType, float nPrimary, float nSecondary)
 		mv_selection_keyboard = 0;
 		mv_selection = mv_mouse_selection;
 		if (mv_selection >= 0)
-		{
 			imp = min(mv_selection + 1, mv_num_maps);
+	}
+
+	if (imp)
+	{
+		if (imp <= mv_num_maps)
 			localcmd(strcat("\nimpulse ", ftos(imp), "\n"));
-			return true;
-		}
+		return true;
 	}
 
 	return false;