From 2da7b6457917cc790c3bbedf4f8e2cbfd041356c Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Sat, 10 Nov 2018 12:31:41 +0000
Subject: [PATCH] * Fix spectators having the "YOU ARE THIS PERSON" highlight
 on the minirankings be done on the person in first. * Apply the "YOU ARE THIS
 PERSON" highlight to all non-splitscreen circumstances that use the tiny
 player icons. (New locations: Tab rankings, intermission, completed votes.)

---
 src/k_kart.c  |  7 +++++--
 src/y_inter.c | 12 ++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/k_kart.c b/src/k_kart.c
index b6c53b842..34a633815 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -6513,7 +6513,7 @@ static boolean K_drawKartPositionFaces(void)
 	// FACE_Y = 72;				//  72
 
 	INT32 Y = FACE_Y+9; // +9 to offset where it's being drawn if there are more than one
-	INT32 i, j, ranklines, strank = 0;
+	INT32 i, j, ranklines, strank = -1;
 	boolean completed[MAXPLAYERS];
 	INT32 rankplayer[MAXPLAYERS];
 	INT32 bumperx, numplayersingame = 0;
@@ -6574,7 +6574,7 @@ static boolean K_drawKartPositionFaces(void)
 	else
 		Y -= (9*5);
 
-	if (G_BattleGametype() || strank <= 2) // too close to the top, or playing battle?
+	if (G_BattleGametype() || strank <= 2) // too close to the top, or playing battle, or a spectator? would have had (strank == -1) called out, but already caught by (strank <= 2)
 	{
 		i = 0;
 		if (ranklines > 5) // could be both...
@@ -6703,6 +6703,9 @@ void HU_DrawTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scorelines, I
 			}*/
 		}
 
+		if (tab[i].num == whiteplayer)
+			V_DrawScaledPatch(x, y-4, 0, kp_facehighlight[(leveltime / 4) % 8]);
+
 		if (G_BattleGametype() && players[tab[i].num].kartstuff[k_bumper] <= 0)
 			V_DrawScaledPatch(x-4, y-7, 0, kp_ranknobumpers);
 		else
diff --git a/src/y_inter.c b/src/y_inter.c
index 51faeaa08..7fc21e535 100644
--- a/src/y_inter.c
+++ b/src/y_inter.c
@@ -468,6 +468,12 @@ void Y_IntermissionDrawer(void)
 					V_DrawMappedPatch(x+16, y-4, 0,facerankprefix[*data.match.character[i]], colormap);
 				}
 
+				if (data.match.num[i] == whiteplayer)
+				{
+					UINT8 cursorframe = (intertic / 4) % 8;
+					V_DrawScaledPatch(x+16, y-4, 0, W_CachePatchName(va("K_CHILI%d", cursorframe+1), PU_CACHE));
+				}
+
 				if (!gutter)
 					strlcpy(strtime, data.match.name[i], 6);
 				else
@@ -1105,6 +1111,12 @@ void Y_VoteDrawer(void)
 				UINT8 *colormap = R_GetTranslationColormap(players[i].skin, players[i].skincolor, GTC_CACHE);
 				V_DrawMappedPatch(x+24, y+9, V_SNAPTOLEFT, facerankprefix[players[i].skin], colormap);
 			}
+
+			if (!splitscreen && i == consoleplayer)
+			{
+				UINT8 cursorframe = (votetic / 4) % 8;
+				V_DrawScaledPatch(x+24, y+9, 0, W_CachePatchName(va("K_CHILI%d", cursorframe+1), PU_CACHE));
+			}
 		}
 
 		y += 30;