thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'silhouette-results' into 'master'

Browse source 
Tally, Intermission: mask not-yet-unlocked characters

Closes #1213

See merge request KartKrew/Kart!2169
This commit is contained in:
James R. 2024-03-27 04:01:53 +00:00
commit 59b335ed09
4 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/k_hud.cpp
View file

@ -90,7 +90,7 @@ patch_t *kp_facenum[MAXPLAYERS+1];
static patch_t *kp_facehighlight[8]; static patch_t *kp_facehighlight[8];
static patch_t *kp_nocontestminimap; static patch_t *kp_nocontestminimap;
static patch_t *kp_unknownminimap; patch_t *kp_unknownminimap;
static patch_t *kp_spbminimap; static patch_t *kp_spbminimap;
static patch_t *kp_wouldyoustillcatchmeifiwereaworm; static patch_t *kp_wouldyoustillcatchmeifiwereaworm;
static patch_t *kp_catcherminimap; static patch_t *kp_catcherminimap;

2
src/k_hud.h
View file

@ -95,6 +95,8 @@ extern patch_t *kp_button_left[2];
extern patch_t *kp_eggnum[6]; extern patch_t *kp_eggnum[6];
extern patch_t *kp_facenum[MAXPLAYERS+1]; extern patch_t *kp_facenum[MAXPLAYERS+1];
extern patch_t *kp_unknownminimap;
void K_AddMessage(const char *msg, boolean interrupt, boolean persist); void K_AddMessage(const char *msg, boolean interrupt, boolean persist);
void K_AddMessageForPlayer(player_t *player, const char *msg, boolean interrupt, boolean persist); void K_AddMessageForPlayer(player_t *player, const char *msg, boolean interrupt, boolean persist);
void K_ClearPersistentMessages(void); void K_ClearPersistentMessages(void);

2
src/k_tally.cpp
View file

@ -425,7 +425,7 @@ void level_tally_t::Init(player_t *player)
{ {
snprintf( snprintf(
header, sizeof header, header, sizeof header,
"%s", skins[player->skin].realname "%s", R_CanShowSkinInDemo(player->skin) ? skins[player->skin].realname : "???"
); );
} }

13
src/y_inter.cpp
View file

@ -391,7 +391,7 @@ static void Y_CalculateMatchData(UINT8 rankingsmode, void (*comparison)(INT32))
snprintf(data.headerstring, snprintf(data.headerstring,
sizeof data.headerstring, sizeof data.headerstring,
"%s", "%s",
skins[players[i].skin].realname); R_CanShowSkinInDemo(players[i].skin) ? skins[players[i].skin].realname : "???");
} }
data.showroundnum = true; data.showroundnum = true;
@ -558,7 +558,11 @@ void Y_PlayerStandingsDrawer(y_data_t *standings, INT32 xoffset)
else else
{ {
UINT8 *charcolormap = NULL; UINT8 *charcolormap = NULL;
if (standings->color[i] != SKINCOLOR_NONE) if (!R_CanShowSkinInDemo(standings->character[i]))
{
charcolormap = R_GetTranslationColormap(TC_BLINK, static_cast<skincolornum_t>(standings->color[i]), GTC_CACHE);
}
else if (standings->color[i] != SKINCOLOR_NONE)
{ {
charcolormap = R_GetTranslationColormap(standings->character[i], static_cast<skincolornum_t>(standings->color[i]), GTC_CACHE); charcolormap = R_GetTranslationColormap(standings->character[i], static_cast<skincolornum_t>(standings->color[i]), GTC_CACHE);
} }
@ -646,7 +650,10 @@ void Y_PlayerStandingsDrawer(y_data_t *standings, INT32 xoffset)
else else
{ {
charcolormap = R_GetTranslationColormap(standings->character[i], static_cast<skincolornum_t>(standings->color[i]), GTC_CACHE); charcolormap = R_GetTranslationColormap(standings->character[i], static_cast<skincolornum_t>(standings->color[i]), GTC_CACHE);
V_DrawMappedPatch(x+14, y-5, 0, faceprefix[standings->character[i]][FACE_MINIMAP], charcolormap); V_DrawMappedPatch(x+14, y-5, 0,
R_CanShowSkinInDemo(standings->character[i]) ?
faceprefix[standings->character[i]][FACE_MINIMAP] : kp_unknownminimap,
charcolormap);
} }
} }