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

Bugfixing for interactions between Profile charsel and Challenge Board

Browse source 
- Editing the current profile for a player will update their Driver so map command and Challenge Driver have proper comparison available
- Re-order M_CharacterSelectInit so driver/follower info is available/valid when M_SetupProfileGridPos is called
This commit is contained in:
toaster 2025-08-15 20:10:03 +01:00
parent cba9292960
commit 9bd213ac78
2 changed files with 46 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/menus/options-profiles-edit-1.c
View file

@ -109,6 +109,11 @@ static void M_ProfileEditApply(void)
if (belongsto > -1 && belongsto < MAXSPLITSCREENPLAYERS) if (belongsto > -1 && belongsto < MAXSPLITSCREENPLAYERS)
{ {
PR_ApplyProfileToggles(optionsmenu.profilen, belongsto); PR_ApplyProfileToggles(optionsmenu.profilen, belongsto);
if (gamestate == GS_MENU)
{
// Safe to apply skin, etc here.
PR_ApplyProfileLight(optionsmenu.profilen, belongsto);
}
} }
// Reapply player 1's real profile ID. // Reapply player 1's real profile ID.

82
src/menus/play-char-select.c
View file

@ -304,47 +304,6 @@ void M_CharacterSelectInit(void)
memset(setup_explosions, 0, sizeof(setup_explosions)); memset(setup_explosions, 0, sizeof(setup_explosions));
setup_animcounter = 0; setup_animcounter = 0;
for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
{
// Default to no follower / match colour.
setup_player[i].followern = -1;
setup_player[i].followercategory = -1;
setup_player[i].followercolor = SKINCOLOR_NONE;
setup_player[i].profilen_slide.start = 0;
setup_player[i].profilen_slide.dist = 0;
// If we're on prpfile select, skip straight to CSSTEP_CHARS
// do the same if we're midgame, but make sure to consider splitscreen properly.
if (optionsmenu.profile && i == 0)
{
setup_player[i].profilen = optionsmenu.profilen;
//PR_ApplyProfileLight(setup_player[i].profilen, 0);
M_SetupProfileGridPos(&setup_player[i]);
setup_player[i].mdepth = CSSTEP_CHARS;
}
else
{
// Set default selected profile to the last used profile for each player:
// (Make sure we don't overshoot it somehow if we deleted profiles or whatnot)
setup_player[i].profilen = min(cv_lastprofile[i].value, PR_GetNumProfiles());
if (gamestate != GS_MENU && i <= splitscreen)
{
M_SetupMidGameGridPos(&setup_player[i], i);
setup_player[i].mdepth = CSSTEP_CHARS;
}
else
{
// Un-set devices
G_SetDeviceForPlayer(i, -1);
#ifdef CHARSELECT_DEVICEDEBUG
CONS_Printf("M_CharacterSelectInit: Device for %d set to %d\n", i, -1);
#endif
}
}
}
for (i = 0; i < numskins; i++) for (i = 0; i < numskins; i++)
{ {
UINT8 x = skins[i]->kartspeed-1; UINT8 x = skins[i]->kartspeed-1;
@ -391,6 +350,47 @@ void M_CharacterSelectInit(void)
} }
setup_page = 0; setup_page = 0;
for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
{
// Default to no follower / match colour.
setup_player[i].followern = -1;
setup_player[i].followercategory = -1;
setup_player[i].followercolor = SKINCOLOR_NONE;
setup_player[i].profilen_slide.start = 0;
setup_player[i].profilen_slide.dist = 0;
// If we're on prpfile select, skip straight to CSSTEP_CHARS
// do the same if we're midgame, but make sure to consider splitscreen properly.
if (optionsmenu.profile && i == 0)
{
setup_player[i].profilen = optionsmenu.profilen;
//PR_ApplyProfileLight(setup_player[i].profilen, 0);
M_SetupProfileGridPos(&setup_player[i]);
setup_player[i].mdepth = CSSTEP_CHARS;
}
else
{
// Set default selected profile to the last used profile for each player:
// (Make sure we don't overshoot it somehow if we deleted profiles or whatnot)
setup_player[i].profilen = min(cv_lastprofile[i].value, PR_GetNumProfiles());
if (gamestate != GS_MENU && i <= splitscreen)
{
M_SetupMidGameGridPos(&setup_player[i], i);
setup_player[i].mdepth = CSSTEP_CHARS;
}
else
{
// Un-set devices
G_SetDeviceForPlayer(i, -1);
#ifdef CHARSELECT_DEVICEDEBUG
CONS_Printf("M_CharacterSelectInit: Device for %d set to %d\n", i, -1);
#endif
}
}
}
} }