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

Increment PROFILEVER due to merge conflict resolution

Browse source
This commit is contained in:
toaster 2023-04-11 19:49:08 +01:00
parent 0aabb6ddcd
commit a97373cb7a
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/k_profiles.c
View file

@ -389,8 +389,8 @@ void PR_LoadProfiles(void)
profilesList[i]->followercolor = PROFILEDEFAULTFOLLOWERCOLOR; profilesList[i]->followercolor = PROFILEDEFAULTFOLLOWERCOLOR;
} }
// Profile update 4-->5: PWR isn't in profile data anymore. // Profile update 5-->6: PWR isn't in profile data anymore.
if (version < 5) if (version < 6)
{ {
for (j = 0; j < PWRLV_NUMTYPES; j++) for (j = 0; j < PWRLV_NUMTYPES; j++)
{ {
@ -419,7 +419,7 @@ void PR_LoadProfiles(void)
{ {
#ifdef DEVELOP #ifdef DEVELOP
// Profile update 1-->2: Add gc_rankings. // Profile update 1-->2: Add gc_rankings.
// Profile update 3-->5: Add gc_startlossless. // Profile update 4-->5: Add gc_startlossless.
if ((j == gc_rankings && version < 2) || if ((j == gc_rankings && version < 2) ||
(j == gc_startlossless && version < 5)) (j == gc_startlossless && version < 5))
{ {

2
src/k_profiles.h
View file

@ -31,7 +31,7 @@ extern "C" {
#define SKINNAMESIZE 16 #define SKINNAMESIZE 16
#define PROFILENAMELEN 6 #define PROFILENAMELEN 6
#define PROFILEVER 5 #define PROFILEVER 6
#define MAXPROFILES 16 #define MAXPROFILES 16
#define PROFILESFILE "ringprofiles.prf" #define PROFILESFILE "ringprofiles.prf"
#define PROFILE_GUEST 0 #define PROFILE_GUEST 0