From 70b56bf973008976c20f55cb6817cb5d0546cf9e Mon Sep 17 00:00:00 2001 From: AJ Martinez Date: Wed, 24 Apr 2024 23:28:56 -0700 Subject: [PATCH 1/2] Disable Lite Steer for new profiles by default --- src/cvars.cpp | 10 +++++----- src/k_profiles.cpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/cvars.cpp b/src/cvars.cpp index ac1d4d14a..df857796f 100644 --- a/src/cvars.cpp +++ b/src/cvars.cpp @@ -965,7 +965,7 @@ consvar_t cv_dummymenuplayer = MenuDummy("dummymenuplayer", "P1").onchange(Dummy consvar_t cv_dummyprofileautoroulette = MenuDummy("dummyprofileautoroulette", "Off").on_off(); consvar_t cv_dummyprofilefov = MenuDummy("dummyprofilefov", "90").min_max(70, 110); -consvar_t cv_dummyprofilelitesteer = MenuDummy("dummyprofilelitesteer", "On").on_off(); +consvar_t cv_dummyprofilelitesteer = MenuDummy("dummyprofilelitesteer", "Off").on_off(); consvar_t cv_dummyprofilekickstart = MenuDummy("dummyprofilekickstart", "Off").on_off(); consvar_t cv_dummyprofilename = MenuDummy("dummyprofilename", ""); consvar_t cv_dummyprofileplayername = MenuDummy("dummyprofileplayername", ""); @@ -1072,10 +1072,10 @@ consvar_t cv_autoroulette[MAXSPLITSCREENPLAYERS] = { }; consvar_t cv_litesteer[MAXSPLITSCREENPLAYERS] = { - Player("litesteer", "On").on_off().onchange(weaponPrefChange), - Player("litesteer2", "On").on_off().onchange(weaponPrefChange2), - Player("litesteer3", "On").on_off().onchange(weaponPrefChange3), - Player("litesteer4", "On").on_off().onchange(weaponPrefChange4), + Player("litesteer", "Off").on_off().onchange(weaponPrefChange), + Player("litesteer2", "Off").on_off().onchange(weaponPrefChange2), + Player("litesteer3", "Off").on_off().onchange(weaponPrefChange3), + Player("litesteer4", "Off").on_off().onchange(weaponPrefChange4), }; consvar_t cv_cam_dist[MAXSPLITSCREENPLAYERS] = { diff --git a/src/k_profiles.cpp b/src/k_profiles.cpp index 2d29e8c82..ee4bf65f7 100644 --- a/src/k_profiles.cpp +++ b/src/k_profiles.cpp @@ -80,7 +80,7 @@ profile_t* PR_MakeProfile( newprofile->followercolor = fcol; newprofile->kickstartaccel = false; newprofile->autoroulette = false; - newprofile->litesteer = true; + newprofile->litesteer = false; newprofile->rumble = true; newprofile->fov = atoi(cv_dummyprofilefov.defaultvalue); From a3a157987502cb35236fc60893f3df199405f67b Mon Sep 17 00:00:00 2001 From: James R Date: Thu, 25 Apr 2024 01:44:22 -0700 Subject: [PATCH 2/2] Bump PROFILEVER, old profiles are converted and have Lite Steer turned off - Prints a message in the log file Profile 'PRFA' was converted from version 1 to version 2 --- src/k_profiles.cpp | 14 ++++++++++++++ src/k_profiles.h | 6 +++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/k_profiles.cpp b/src/k_profiles.cpp index ee4bf65f7..b55ac2a8b 100644 --- a/src/k_profiles.cpp +++ b/src/k_profiles.cpp @@ -412,6 +412,7 @@ void PR_LoadProfiles(void) for (size_t i = 1; i < numprofiles; i++) { + bool converted = false; auto& jsprof = js.profiles[i - 1]; profile_t* newprof = static_cast(Z_Calloc(sizeof(profile_t), PU_STATIC, NULL)); profilesList[i] = newprof; @@ -467,6 +468,13 @@ void PR_LoadProfiles(void) newprof->rumble = jsprof.preferences.rumble; newprof->fov = jsprof.preferences.fov; + if (jsprof.version == 1) + { + // Version 1 -> 2: litesteer is now off by default, reset old profiles + newprof->litesteer = false; + converted = true; + } + try { for (size_t j = 0; j < num_gamecontrols; j++) @@ -482,6 +490,12 @@ void PR_LoadProfiles(void) I_Error("Profile '%s' controls are corrupt", jsprof.playername.c_str()); return; } + + if (converted) + { + CONS_Printf("Profile '%s' was converted from version %d to version %d\n", + newprof->profilename, jsprof.version, PROFILEVER); + } } profilesList[PROFILE_GUEST] = dprofile; diff --git a/src/k_profiles.h b/src/k_profiles.h index 0d1c922bd..0870c5d5e 100644 --- a/src/k_profiles.h +++ b/src/k_profiles.h @@ -109,7 +109,11 @@ extern "C" { #define SKINNAMESIZE 16 #define PROFILENAMELEN 6 -#define PROFILEVER 1 +// Version history: +// 1 - first +// 2 - litesteer is off by default, old profiles litesteer +// option is reset to default +#define PROFILEVER 2 #define MAXPROFILES 16 #define PROFILESFILE "ringprofiles.prf" #define PROFILE_GUEST 0