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,22 +1428,26 @@ ticcmd_t *G_MoveTiccmd(ticcmd_t* dest, const ticcmd_t* src, const size_t n)
static void weaponPrefChange(void) static void weaponPrefChange(void)
{ {
WeaponPref_Send(0); if (Playing())
WeaponPref_Send(0);
} }
static void weaponPrefChange2(void) static void weaponPrefChange2(void)
{ {
WeaponPref_Send(1); if (Playing())
WeaponPref_Send(1);
} }
static void weaponPrefChange3(void) static void weaponPrefChange3(void)
{ {
WeaponPref_Send(2); if (Playing())
WeaponPref_Send(2);
} }
static void weaponPrefChange4(void) static void weaponPrefChange4(void)
{ {
WeaponPref_Send(3); if (Playing())
WeaponPref_Send(3);
} }
// //

View file

@ -188,7 +188,7 @@ static void M_ProfileControlSaveResponse(INT32 choice)
if (belongsto > -1 && belongsto < MAXSPLITSCREENPLAYERS) if (belongsto > -1 && belongsto < MAXSPLITSCREENPLAYERS)
{ {
memcpy(&gamecontrol[belongsto], optionsmenu.tempcontrols, sizeof(gamecontroldefault)); 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); M_GoBack(0);