From 2ea6e6feb77cf64eb08b1b5c83a1b29cb62944fc Mon Sep 17 00:00:00 2001 From: terencehill Date: Sat, 3 Jun 2023 01:00:57 +0200 Subject: [PATCH] Map vote screen: fix abstain vote shown over the winner map --- qcsrc/client/mapvoting.qc | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/qcsrc/client/mapvoting.qc b/qcsrc/client/mapvoting.qc index 9e6f6395b..7c3d80352 100644 --- a/qcsrc/client/mapvoting.qc +++ b/qcsrc/client/mapvoting.qc @@ -512,6 +512,17 @@ void MapVote_Draw() else DrawItem(pos + MapVote_GridVec(dist, i, mv_columns), dist.y, dist.x, map, "", tmp, i); } + + if(mv_abstain) + ++mv_num_maps; + + if(mv_abstain && i < mv_num_maps) { + tmp = mv_votes[i]; + pos.y = ymax + abstain_spacing; + pos.x = (xmax + xmin) * 0.5; + MapVote_DrawAbstain(pos, dist.x, xmax - xmin, tmp, i); + } + if (mv_winner) { // expand winner map image @@ -536,16 +547,6 @@ void MapVote_Draw() MapVote_DrawMapPicture(mv_pics[mv_winner - 1], img_pos, img_size, theAlpha); } - - if(mv_abstain) - ++mv_num_maps; - - if(mv_abstain && i < mv_num_maps) { - tmp = mv_votes[i]; - pos.y = ymax + abstain_spacing; - pos.x = (xmax+xmin)*0.5; - MapVote_DrawAbstain(pos, dist.x, xmax - xmin, tmp, i); - } } void Cmd_MapVote_MapDownload(int argc) -- 2.39.2