mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-12-19 06:22:26 +00:00
Merge branch 'lite-steer-default-off' into 'master'
Disable Lite Steer for new profiles by default See merge request KartKrew/Kart!2297
This commit is contained in:
commit
a375353884
3 changed files with 25 additions and 7 deletions
|
|
@ -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] = {
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
|
|
@ -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<profile_t*>(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;
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue