From 770293e04c30c85453d6e6e48deede9665dde895 Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Wed, 22 Nov 2023 19:44:39 -0500 Subject: [PATCH 1/2] Dimmed votes are greyscale Makes the visuals on the voting screen significantly more clear --- src/k_vote.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/k_vote.c b/src/k_vote.c index 8a2fce4ed..111248bf7 100644 --- a/src/k_vote.c +++ b/src/k_vote.c @@ -434,7 +434,7 @@ static void Y_DrawVoteThumbnail(fixed_t center_x, fixed_t center_y, fixed_t widt x, y, width, flags | ((encore == true) ? V_FLIP : 0), g_voteLevels[v][0], - NULL + (dim == true ? R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_GREY, GTC_MENUCACHE) : NULL) ); if (encore == true) From 5207af40b137d88d7e7b09fbaeea3cc9930c1781 Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Wed, 22 Nov 2023 20:14:01 -0500 Subject: [PATCH 2/2] Fix odd low player count servers Has been killing me ever since it got into master. When vote count changes, one of the votes won't be sliding back and forth across the entire screen. --- src/k_vote.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/k_vote.c b/src/k_vote.c index 111248bf7..8213ca081 100644 --- a/src/k_vote.c +++ b/src/k_vote.c @@ -301,12 +301,14 @@ static void Y_SortPile(void) if (votesLeft > rowSize) { + SINT8 topRowIndex = (rowSize - ((votesLeft - 1) % rowSize)) - 1; + if (odd == true) { rowSize--; + topRowIndex--; } - const SINT8 topRowIndex = (rowSize - ((votesLeft - 1) % rowSize)) - 1; xOffset = -(rowSize - 1) + (topRowIndex << 1); pile->destY -= PILE_SPACING_H >> 1;