vivlim/Kart-Public
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Minor vote screen fixes

Browse source
This commit is contained in:
TehRealSalt 2018-06-12 19:05:11 -04:00
parent 510cf8b521
commit d1e206072a
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/y_inter.c
View file

@ -2206,6 +2206,7 @@ void Y_VoteDrawer(void)
for (j = 0; j <= splitscreen; j++) // another loop for drawing the selection backgrounds in the right order, grumble grumble.. for (j = 0; j <= splitscreen; j++) // another loop for drawing the selection backgrounds in the right order, grumble grumble..
{ {
INT32 handy = y; INT32 handy = y;
UINT8 p;
UINT8 *colormap; UINT8 *colormap;
patch_t *thiscurs; patch_t *thiscurs;
@ -2215,7 +2216,8 @@ void Y_VoteDrawer(void)
if (splitscreen == 0) if (splitscreen == 0)
{ {
thiscurs = cursor; thiscurs = cursor;
color = colortranslations[players[consoleplayer].skincolor][7]; p = consoleplayer;
color = 104;
colormap = NULL; colormap = NULL;
} }
else else
@ -2224,27 +2226,29 @@ void Y_VoteDrawer(void)
{ {
case 1: case 1:
thiscurs = cursor2; thiscurs = cursor2;
color = colortranslations[players[secondarydisplayplayer].skincolor][7]; p = secondarydisplayplayer;
colormap = R_GetTranslationColormap(-1, players[secondarydisplayplayer].skincolor, GTC_CACHE);
break; break;
case 2: case 2:
thiscurs = cursor3; thiscurs = cursor3;
color = colortranslations[players[thirddisplayplayer].skincolor][7]; p = thirddisplayplayer;
colormap = R_GetTranslationColormap(-1, players[thirddisplayplayer].skincolor, GTC_CACHE);
break; break;
case 3: case 3:
thiscurs = cursor4; thiscurs = cursor4;
color = colortranslations[players[fourthdisplayplayer].skincolor][7]; p = fourthdisplayplayer;
colormap = R_GetTranslationColormap(-1, players[fourthdisplayplayer].skincolor, GTC_CACHE);
break; break;
default: default:
thiscurs = cursor1; thiscurs = cursor1;
color = colortranslations[players[consoleplayer].skincolor][7]; p = displayplayer;
colormap = R_GetTranslationColormap(-1, players[consoleplayer].skincolor, GTC_CACHE);
break; break;
} }
color = colortranslations[players[p].skincolor][7];
colormap = R_GetTranslationColormap(TC_DEFAULT, players[p].skincolor, GTC_CACHE);
} }
if (votes[p] != -1 || players[p].spectator)
continue;
handy += 6*(3-splitscreen) + (13*j); handy += 6*(3-splitscreen) + (13*j);
V_DrawMappedPatch(BASEVIDWIDTH-124, handy, V_SNAPTORIGHT, thiscurs, colormap); V_DrawMappedPatch(BASEVIDWIDTH-124, handy, V_SNAPTORIGHT, thiscurs, colormap);