From a97373cb7a8541012b92fae46d0756bae4a42a47 Mon Sep 17 00:00:00 2001 From: toaster Date: Tue, 11 Apr 2023 19:49:08 +0100 Subject: [PATCH] Increment PROFILEVER due to merge conflict resolution --- src/k_profiles.c | 6 +++--- src/k_profiles.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/k_profiles.c b/src/k_profiles.c index 2a7c95350..67a0b822e 100644 --- a/src/k_profiles.c +++ b/src/k_profiles.c @@ -389,8 +389,8 @@ void PR_LoadProfiles(void) profilesList[i]->followercolor = PROFILEDEFAULTFOLLOWERCOLOR; } - // Profile update 4-->5: PWR isn't in profile data anymore. - if (version < 5) + // Profile update 5-->6: PWR isn't in profile data anymore. + if (version < 6) { for (j = 0; j < PWRLV_NUMTYPES; j++) { @@ -419,7 +419,7 @@ void PR_LoadProfiles(void) { #ifdef DEVELOP // 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) || (j == gc_startlossless && version < 5)) { diff --git a/src/k_profiles.h b/src/k_profiles.h index 4890a4207..117c91900 100644 --- a/src/k_profiles.h +++ b/src/k_profiles.h @@ -31,7 +31,7 @@ extern "C" { #define SKINNAMESIZE 16 #define PROFILENAMELEN 6 -#define PROFILEVER 5 +#define PROFILEVER 6 #define MAXPROFILES 16 #define PROFILESFILE "ringprofiles.prf" #define PROFILE_GUEST 0