From d69e92d70f8616e1620d369122069e9662eea172 Mon Sep 17 00:00:00 2001 From: toaster Date: Sat, 18 Feb 2023 14:15:58 +0000 Subject: [PATCH] Fix changing kickstartaccel from the profile menu - M_ProfileControlSaveResponse: Set without stealth (ie, call command which sends XD_WEAPONPREF netxcmd) - weaponPrefChange (and its splitscreen ilk): Only build/send XD_WEAPONPREF command when Playing() --- src/g_game.c | 12 ++++++++---- src/menus/options-profiles-edit-controls.c | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/g_game.c b/src/g_game.c index db23f0c1c..ecf088eaf 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -1428,22 +1428,26 @@ ticcmd_t *G_MoveTiccmd(ticcmd_t* dest, const ticcmd_t* src, const size_t n) static void weaponPrefChange(void) { - WeaponPref_Send(0); + if (Playing()) + WeaponPref_Send(0); } static void weaponPrefChange2(void) { - WeaponPref_Send(1); + if (Playing()) + WeaponPref_Send(1); } static void weaponPrefChange3(void) { - WeaponPref_Send(2); + if (Playing()) + WeaponPref_Send(2); } static void weaponPrefChange4(void) { - WeaponPref_Send(3); + if (Playing()) + WeaponPref_Send(3); } // diff --git a/src/menus/options-profiles-edit-controls.c b/src/menus/options-profiles-edit-controls.c index f2c19ac1d..ca0c2579a 100644 --- a/src/menus/options-profiles-edit-controls.c +++ b/src/menus/options-profiles-edit-controls.c @@ -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);