From d1e206072ac5433ad9271a70b10c6c405302855e Mon Sep 17 00:00:00 2001
From: TehRealSalt <tehrealsalt@gmail.com>
Date: Tue, 12 Jun 2018 19:05:11 -0400
Subject: [PATCH] Minor vote screen fixes

---
 src/y_inter.c | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/y_inter.c b/src/y_inter.c
index 15b20d87..11fefe72 100644
--- a/src/y_inter.c
+++ b/src/y_inter.c
@@ -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..
 			{
 				INT32 handy = y;
+				UINT8 p;
 				UINT8 *colormap;
 				patch_t *thiscurs;
 
@@ -2215,7 +2216,8 @@ void Y_VoteDrawer(void)
 				if (splitscreen == 0)
 				{
 					thiscurs = cursor;
-					color = colortranslations[players[consoleplayer].skincolor][7];
+					p = consoleplayer;
+					color = 104;
 					colormap = NULL;
 				}
 				else
@@ -2224,27 +2226,29 @@ void Y_VoteDrawer(void)
 					{
 						case 1:
 							thiscurs = cursor2;
-							color = colortranslations[players[secondarydisplayplayer].skincolor][7];
-							colormap = R_GetTranslationColormap(-1, players[secondarydisplayplayer].skincolor, GTC_CACHE);
+							p = secondarydisplayplayer;
 							break;
 						case 2:
 							thiscurs = cursor3;
-							color = colortranslations[players[thirddisplayplayer].skincolor][7];
-							colormap = R_GetTranslationColormap(-1, players[thirddisplayplayer].skincolor, GTC_CACHE);
+							p = thirddisplayplayer;
 							break;
 						case 3:
 							thiscurs = cursor4;
-							color = colortranslations[players[fourthdisplayplayer].skincolor][7];
-							colormap = R_GetTranslationColormap(-1, players[fourthdisplayplayer].skincolor, GTC_CACHE);
+							p = fourthdisplayplayer;
 							break;
 						default:
 							thiscurs = cursor1;
-							color = colortranslations[players[consoleplayer].skincolor][7];
-							colormap = R_GetTranslationColormap(-1, players[consoleplayer].skincolor, GTC_CACHE);
+							p = displayplayer;
 							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);
 				V_DrawMappedPatch(BASEVIDWIDTH-124, handy, V_SNAPTORIGHT, thiscurs, colormap);