thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 12:31:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix "_Profile" relevantskin option

Browse source 
- Gets closest statted character if yours is not yet unlocked
- Accounts for default skin color (previously was mildly broken in this case)
This commit is contained in:
toaster 2025-07-24 19:29:51 +01:00
parent 8a7df9678e
commit 998823db32
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/p_setup.cpp
View file

@ -120,6 +120,7 @@
#include "k_credits.h"
#include "k_objects.h"
#include "p_deepcopy.h"
#include "k_color.h" // K_ColorUsable
// Replay names have time
#if !defined (UNDER_CE)
@ -8046,7 +8047,7 @@ static void P_ShuffleTeams(void)
static void P_InitPlayers(void)
{
INT32 i, skin = -1, follower = -1, col = -1;
INT32 i, skin = -1, follower = -1, col = SKINCOLOR_NONE;
// Make sure objectplace is OFF when you first start the level!
OP_ResetObjectplace();
@ -8063,10 +8064,19 @@ static void P_InitPlayers(void)
if (strcmp(mapheaderinfo[gamemap-1]->relevantskin, "_PROFILE") == 0)
{
profile_t *p = PR_GetProfile(cv_ttlprofilen.value);
if (p)
if (p && !netgame)
{
skin = R_SkinAvailable(p->skinname);
col = p->color;
if (!R_SkinUsable(g_localplayers[0], skin, false))
{
skin = GetSkinNumClosestToStats(skins[skin].kartspeed, skins[skin].kartweight, skins[skin].flags, false);
}
if (K_ColorUsable(static_cast<skincolornum_t>(p->color), false, true) == true)
{
col = p->color;
}
}
}
else
@ -8109,7 +8119,7 @@ static void P_InitPlayers(void)
if (skin != -1)
{
SetPlayerSkinByNum(i, skin);
players[i].skincolor = (col >= 0 && col < numskincolors) ? col : skins[skin].prefcolor;
players[i].skincolor = (col != SKINCOLOR_NONE) ? col : skins[skin].prefcolor;
players[i].followerskin = follower;
if (follower != -1)