Merge branch 'greyscale-vote' into 'master'

Dimmed votes are greyscale

See merge request KartKrew/Kart!1658
This commit is contained in:
Oni 2023-11-23 01:31:37 +00:00
commit 392d4a4d5f

View file

@ -301,12 +301,14 @@ static void Y_SortPile(void)
if (votesLeft > rowSize) if (votesLeft > rowSize)
{ {
SINT8 topRowIndex = (rowSize - ((votesLeft - 1) % rowSize)) - 1;
if (odd == true) if (odd == true)
{ {
rowSize--; rowSize--;
topRowIndex--;
} }
const SINT8 topRowIndex = (rowSize - ((votesLeft - 1) % rowSize)) - 1;
xOffset = -(rowSize - 1) + (topRowIndex << 1); xOffset = -(rowSize - 1) + (topRowIndex << 1);
pile->destY -= PILE_SPACING_H >> 1; pile->destY -= PILE_SPACING_H >> 1;
@ -434,7 +436,7 @@ static void Y_DrawVoteThumbnail(fixed_t center_x, fixed_t center_y, fixed_t widt
x, y, x, y,
width, flags | ((encore == true) ? V_FLIP : 0), width, flags | ((encore == true) ? V_FLIP : 0),
g_voteLevels[v][0], g_voteLevels[v][0],
NULL (dim == true ? R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_GREY, GTC_MENUCACHE) : NULL)
); );
if (encore == true) if (encore == true)