X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fmapvoting.qc;h=7c3d803527d1e41ccc1a2630a8a94249beaff8c2;hb=8141387a9bf057652453a8d4dc530116cf4cc31a;hp=2a6f39f8a5ff50dcbe63c7fdc628328bcc1eb449;hpb=323105d51f8eb6dea47c063965be5e34ad57f987;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/mapvoting.qc b/qcsrc/client/mapvoting.qc
index 2a6f39f8a..7c3d80352 100644
--- a/qcsrc/client/mapvoting.qc
+++ b/qcsrc/client/mapvoting.qc
@@ -31,13 +31,15 @@ float mv_detail;
 float mv_timeout;
 float mv_top2_time;
 float mv_top2_alpha;
+float mv_winner_time;
+float mv_winner_alpha;
 
 int mv_selection;
 int mv_columns;
 int mv_mouse_selection;
 int mv_selection_keyboard;
 
-float gametypevote;
+bool gametypevote;
 string mapvote_chosenmap;
 vector gtv_text_size;
 vector gtv_text_size_small;
@@ -205,6 +207,19 @@ void GameTypeVote_DrawGameTypeItem(vector pos, float maxh, float tsize, string g
 	delete(title);
 }
 
+void MapVote_DrawMapPicture(string pic, vector pos, vector img_size, float theAlpha)
+{
+	if(pic == "")
+		drawfill(pos, img_size, '.5 .5 .5', .7 * theAlpha, DRAWFLAG_NORMAL);
+	else
+	{
+		if(drawgetimagesize(pic) == '0 0 0')
+			drawpic(pos, draw_UseSkinFor("nopreview_map"), img_size, '1 1 1', theAlpha, DRAWFLAG_NORMAL);
+		else
+			drawpic(pos, pic, img_size, '1 1 1', theAlpha, DRAWFLAG_NORMAL);
+	}
+}
+
 void MapVote_DrawMapItem(vector pos, float isize, float tsize, string map, string pic, float _count, int id)
 {
 	TC(int, id);
@@ -249,35 +264,31 @@ void MapVote_DrawMapItem(vector pos, float isize, float tsize, string map, strin
 	float theAlpha;
 	if (!(mv_flags[id] & GTV_AVAILABLE) && mv_top2_alpha)
 		theAlpha = mv_top2_alpha;
+	else if (mv_winner && mv_winner_alpha)
+		theAlpha = mv_winner_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 * panel_fg_alpha, DRAWFLAG_NORMAL);
-
-	// Highlight current vote
 	vector rgb = MapVote_RGB(id);
-	if(id == mv_ownvote)
+
+	// Highlight selected item
+	if (!mv_winner)
 	{
-		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);
+		if(id == mv_selection && (mv_flags[id] & GTV_AVAILABLE))
+			drawfill(rect_pos, rect_size, '1 1 1', 0.1 * panel_fg_alpha, DRAWFLAG_NORMAL);
+
+		// Highlight current vote
+		if(id == mv_ownvote)
+		{
+			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);
 
-	if(pic == "")
-	{
-		drawfill(pos, img_size, '.5 .5 .5', .7 * theAlpha, DRAWFLAG_NORMAL);
-	}
-	else
-	{
-		if(drawgetimagesize(pic) == '0 0 0')
-			drawpic(pos, draw_UseSkinFor("nopreview_map"), img_size, '1 1 1', theAlpha, DRAWFLAG_NORMAL);
-		else
-			drawpic(pos, pic, img_size, '1 1 1', theAlpha, DRAWFLAG_NORMAL);
-	}
+	MapVote_DrawMapPicture(pic, pos, img_size, theAlpha);
 }
 
 void MapVote_DrawAbstain(vector pos, float isize, float tsize, float _count, int id)
@@ -309,8 +320,9 @@ vector MapVote_GridVec(vector gridspec, int i, int m)
 
 float MapVote_Selection(vector topleft, vector cellsize, float rows, float columns)
 {
-
 	float c, r;
+	if (mv_winner)
+		return -1;
 
 	mv_mouse_selection = -1;
 
@@ -381,8 +393,11 @@ void MapVote_Draw()
 	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', panel_fg_alpha, DRAWFLAG_NORMAL);
+	if (!mv_winner)
+	{
+		pos.x = center - stringwidth(map, false, hud_fontsize * 2) * 0.5;
+		drawstring(pos, map, hud_fontsize * 2, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+	}
 	pos.y += hud_fontsize.y * 2;
 
 	if( mapvote_chosenmap != "" )
@@ -396,8 +411,11 @@ void MapVote_Draw()
 
 	draw_endBoldFont();
 
-	i = ceil(max(0, mv_timeout - time));
-	map = sprintf(_("%d seconds left"), i);
+	i = ceil(max(1, mv_timeout - time)); // make sure 0 seconds left never shows up, not even for a frame
+	if (mv_winner)
+		map = mv_maps[mv_winner - 1];
+	else
+		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', panel_fg_alpha, DRAWFLAG_NORMAL);
 	pos.y += hud_fontsize.y * 1.5;
@@ -475,6 +493,9 @@ void MapVote_Draw()
 	if (mv_top2_time)
 		mv_top2_alpha = max(0.2, 1 - (time - mv_top2_time) ** 2);
 
+	if (mv_winner_time)
+		mv_winner_alpha = max(0.2, 1 - sqrt(max(0, time - mv_winner_time)));
+
 	void (vector, float, float, string, string, float, float) DrawItem;
 
 	if(gametypevote)
@@ -498,9 +519,34 @@ void MapVote_Draw()
 	if(mv_abstain && i < mv_num_maps) {
 		tmp = mv_votes[i];
 		pos.y = ymax + abstain_spacing;
-		pos.x = (xmax+xmin)*0.5;
+		pos.x = (xmax + xmin) * 0.5;
 		MapVote_DrawAbstain(pos, dist.x, xmax - xmin, tmp, i);
 	}
+
+	if (mv_winner)
+	{
+		// expand winner map image
+		vector startsize = '0 0 0';
+		startsize.y = vid_conheight * 0.1;
+		startsize.x = startsize.y * 4/3;
+		vector startpos = panel_pos + (panel_size - startsize) / 2;
+
+		vector endsize = '0 0 0';
+		endsize.y = vid_conheight * 0.5;
+		endsize.x = endsize.y * 4/3;
+		vector endpos = '0 0 0';
+		endpos.y = panel_pos.y;
+		endpos.x = (vid_conwidth - endsize.x) * 0.5;
+
+		float f = bound(0, (time - mv_winner_time) * 2, 1);
+		f = sqrt(f);
+		float theAlpha = f;
+		f = min(0.1 + f, 1);
+		vector img_pos = endpos * f + startpos * (1 - f);
+		vector img_size = endsize * f + startsize * (1 - f);
+
+		MapVote_DrawMapPicture(mv_pics[mv_winner - 1], img_pos, img_size, theAlpha);
+	}
 }
 
 void Cmd_MapVote_MapDownload(int argc)
@@ -637,7 +683,7 @@ void GameTypeVote_ReadOption(int i)
 	}
 	else
 	{
-		Gametype type = MapInfo_Type_FromString(gt, false);
+		Gametype type = MapInfo_Type_FromString(gt, false, false);
 		mv_pk3[i] = strzone(MapInfo_Type_ToText(type));
 		mv_desc[i] = MapInfo_Type_Description(type);
 	}
@@ -687,14 +733,10 @@ void MapVote_Init()
 	mv_ownvote = -1;
 	mv_timeout = ReadCoord();
 
-	gametypevote = ReadByte();
-
-	if(gametypevote)
-	{
+	int gametypevote_flags = ReadByte();
+	gametypevote = boolean(gametypevote_flags & BIT(0));
+	if(gametypevote_flags)
 		mapvote_chosenmap = strzone(ReadString());
-		if ( gametypevote == 2 )
-			gametypevote = 0;
-	}
 
 	MapVote_ReadMask();
 	int i;
@@ -798,7 +840,7 @@ float MapVote_InputEvent(int bInputType, float nPrimary, float nSecondary)
 	TC(int, bInputType);
 
 	static int first_digit = 0;
-	if (!mv_active)
+	if (!mv_active || isdemo())
 		return false;
 
 	if(bInputType == 3)
@@ -834,33 +876,44 @@ float MapVote_InputEvent(int bInputType, float nPrimary, float nSecondary)
 			first_digit = 0;
 	}
 
+	// Key release events must be handled by the engine otherwise the on-press command such as +jump
+	// executed by pressing SPACE before entering the map voting screen won't be followed by the
+	// on-release command (-jump) on key release once entered the map voting screen, causing +jump
+	// to stay active even on the next map and automatically forcing the player to join
+	if (!key_pressed) return false;
+
 	int imp = 0;
 	switch(nPrimary)
 	{
 		case K_RIGHTARROW:
-			if (!key_pressed) return true;
+			if (mv_winner)
+				return true;
 			mv_selection_keyboard = 1;
 			mv_selection = MapVote_MoveRight(mv_selection);
 			return true;
 		case K_LEFTARROW:
-			if (!key_pressed) return true;
+			if (mv_winner)
+				return true;
 			mv_selection_keyboard = 1;
 			mv_selection = MapVote_MoveLeft(mv_selection);
 			return true;
 		case K_DOWNARROW:
-			if (!key_pressed) return true;
+			if (mv_winner)
+				return true;
 			mv_selection_keyboard = 1;
 			mv_selection = MapVote_MoveDown(mv_selection);
 			return true;
 		case K_UPARROW:
-			if (!key_pressed) return true;
+			if (mv_winner)
+				return true;
 			mv_selection_keyboard = 1;
 			mv_selection = MapVote_MoveUp(mv_selection);
 			return true;
 		case K_KP_ENTER:
 		case K_ENTER:
 		case K_SPACE:
-			if (!key_pressed) return true;
+			if (mv_winner)
+				return true;
 			if ( mv_selection_keyboard )
 				MapVote_SendChoice(mv_selection);
 			return true;
@@ -880,8 +933,6 @@ float MapVote_InputEvent(int bInputType, float nPrimary, float nSecondary)
 	{
 		if (!first_digit)
 		{
-			if (!key_pressed)
-				return true;
 			first_digit = imp % 10;
 			return true;
 		}
@@ -891,8 +942,6 @@ float MapVote_InputEvent(int bInputType, float nPrimary, float nSecondary)
 
 	if (nPrimary == K_MOUSE1)
 	{
-		if (!key_pressed)
-			return true;
 		mv_selection_keyboard = 0;
 		mv_selection = mv_mouse_selection;
 		if (mv_selection >= 0)
@@ -904,9 +953,7 @@ float MapVote_InputEvent(int bInputType, float nPrimary, float nSecondary)
 
 	if (imp)
 	{
-		if (!key_pressed)
-			return true;
-		if (imp <= mv_num_maps)
+		if (!mv_winner && imp <= mv_num_maps)
 			localcmd(strcat("\nimpulse ", ftos(imp), "\n"));
 		return true;
 	}
@@ -953,6 +1000,12 @@ NET_HANDLE(ENT_CLIENT_MAPVOTE, bool isnew)
 
 	if(sf & 4)
 		MapVote_UpdateVotes();
+
+	if(sf & 8)
+	{
+		mv_winner = ReadByte();
+		mv_winner_time = time;
+	}
 }
 
 NET_HANDLE(TE_CSQC_PICTURE, bool isNew)