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

Improve profile deletion further

Browse source 
- Fix the check for deleting the current profile
- Handle cv_ttlprofilen like cv_lastprofile[]
This commit is contained in:
toaster 2022-09-01 17:40:26 +01:00
parent 0424f0f07c
commit a6843bae78
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/k_menufunc.c
View file

@ -5507,19 +5507,21 @@ static void M_EraseProfileResponse(INT32 choice)
{ {
if (choice == MA_YES) if (choice == MA_YES)
{ {
const boolean current = (optionsmenu.eraseprofilen == cv_currprofile.value); // has to be grabbed before deletion
S_StartSound(NULL, sfx_itrole); // bweh heh heh S_StartSound(NULL, sfx_itrole); // bweh heh heh
PR_DeleteProfile(optionsmenu.eraseprofilen); PR_DeleteProfile(optionsmenu.eraseprofilen);
if (optionsmenu.eraseprofilen == cv_currprofile.value) if (current)
{ {
CV_StealthSetValue(&cv_currprofile, -1); CV_StealthSetValue(&cv_currprofile, -1);
CV_StealthSetValue(&cv_ttlprofilen, 0);
F_StartIntro(); F_StartIntro();
M_ClearMenus(true); M_ClearMenus(true);
} }
else if (optionsmenu.eraseprofilen > PR_GetNumProfiles()-1) else if (optionsmenu.eraseprofilen > PR_GetNumProfiles()-1)
{
optionsmenu.eraseprofilen--; optionsmenu.eraseprofilen--;
}
} }
} }

9
src/k_profiles.c
View file

@ -114,10 +114,11 @@ boolean PR_DeleteProfile(INT32 num)
profilesList[i] = profilesList[i+1]; profilesList[i] = profilesList[i+1];
} }
// Make sure to move cv_lastprofile values as well! // Make sure to move cv_lastprofile (and title profile) values as well!
for (i = 0; i < MAXSPLITSCREENPLAYERS; i++) for (i = 0; i < MAXSPLITSCREENPLAYERS+1; i++)
{ {
INT32 profileset = cv_lastprofile[i].value; consvar_t *cv = (i == MAXSPLITSCREENPLAYERS) ? &cv_ttlprofilen : &cv_lastprofile[i];
INT32 profileset = cv->value;
if (profileset < num) if (profileset < num)
{ {
@ -136,7 +137,7 @@ boolean PR_DeleteProfile(INT32 num)
profileset = PROFILE_GUEST; profileset = PROFILE_GUEST;
} }
CV_StealthSetValue(&cv_lastprofile[i], profileset); CV_StealthSetValue(cv, profileset);
} }
} }