stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-28 13:21:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Fix spectators having the "YOU ARE THIS PERSON" highlight on the minirankings be done on the person in first.

Browse source 
* 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.)
This commit is contained in:
toaster 2018-11-10 12:31:41 +00:00
parent fa989f2f7f
commit a0badacd22
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/k_kart.c
View file

@ -6513,7 +6513,7 @@ static boolean K_drawKartPositionFaces(void)
// FACE_Y = 72; // 72 // FACE_Y = 72; // 72
INT32 Y = FACE_Y+9; // +9 to offset where it's being drawn if there are more than one 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]; boolean completed[MAXPLAYERS];
INT32 rankplayer[MAXPLAYERS]; INT32 rankplayer[MAXPLAYERS];
INT32 bumperx, numplayersingame = 0; INT32 bumperx, numplayersingame = 0;
@ -6574,7 +6574,7 @@ static boolean K_drawKartPositionFaces(void)
else else
Y -= (9*5); 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; i = 0;
if (ranklines > 5) // could be both... 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) if (G_BattleGametype() && players[tab[i].num].kartstuff[k_bumper] <= 0)
V_DrawScaledPatch(x-4, y-7, 0, kp_ranknobumpers); V_DrawScaledPatch(x-4, y-7, 0, kp_ranknobumpers);
else else

12
src/y_inter.c
View file

@ -468,6 +468,12 @@ void Y_IntermissionDrawer(void)
V_DrawMappedPatch(x+16, y-4, 0,facerankprefix[*data.match.character[i]], colormap); 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) if (!gutter)
strlcpy(strtime, data.match.name[i], 6); strlcpy(strtime, data.match.name[i], 6);
else else
@ -1105,6 +1111,12 @@ void Y_VoteDrawer(void)
UINT8 *colormap = R_GetTranslationColormap(players[i].skin, players[i].skincolor, GTC_CACHE); 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); 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; y += 30;