Merge branch 'kickstart-clear' into 'master'

Kickstart Clear

See merge request KartKrew/Kart!938
This commit is contained in:
Oni 2023-02-18 23:47:43 +00:00
commit 69f567d09d
2 changed files with 9 additions and 5 deletions

View file

@ -1428,21 +1428,25 @@ ticcmd_t *G_MoveTiccmd(ticcmd_t* dest, const ticcmd_t* src, const size_t n)
static void weaponPrefChange(void)
{
if (Playing())
WeaponPref_Send(0);
}
static void weaponPrefChange2(void)
{
if (Playing())
WeaponPref_Send(1);
}
static void weaponPrefChange3(void)
{
if (Playing())
WeaponPref_Send(2);
}
static void weaponPrefChange4(void)
{
if (Playing())
WeaponPref_Send(3);
}

View file

@ -188,7 +188,7 @@ static void M_ProfileControlSaveResponse(INT32 choice)
if (belongsto > -1 && belongsto < MAXSPLITSCREENPLAYERS)
{
memcpy(&gamecontrol[belongsto], optionsmenu.tempcontrols, sizeof(gamecontroldefault));
CV_StealthSetValue(&cv_kickstartaccel[belongsto], cv_dummyprofilekickstart.value);
CV_SetValue(&cv_kickstartaccel[belongsto], cv_dummyprofilekickstart.value);
}
M_GoBack(0);