From eef6667fbc7cfb4e7613b4416acf7e19ed2e6792 Mon Sep 17 00:00:00 2001 From: terminx Date: Wed, 20 Feb 2019 21:32:56 +0000 Subject: [PATCH] Save mouse and joystick analog scales, dead zones, and saturation values to .cfg whether they're the defaults or not This fixes an issue where changing one of these values would result in the value being written to the .cfg, but changing the value back to the default would leave the old value in the .cfg. git-svn-id: https://svn.eduke32.com/eduke32@7341 1a8010ca-5511-0410-912e-c29ae57300e0 --- source/duke3d/src/config.cpp | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/source/duke3d/src/config.cpp b/source/duke3d/src/config.cpp index 55bc8058b..c8a16a17c 100644 --- a/source/duke3d/src/config.cpp +++ b/source/duke3d/src/config.cpp @@ -835,11 +835,8 @@ void CONFIG_WriteSetup(uint32_t flags) SCRIPT_PutString(ud.config.scripthandle, "Controls", buf, CONFIG_FunctionNumToName(ud.config.MouseDigitalFunctions[i][1])); } - if (ud.config.MouseAnalogueScale[i] != DEFAULTMOUSEANALOGUESCALE) - { - Bsprintf(buf, "MouseAnalogScale%d", i); - SCRIPT_PutNumber(ud.config.scripthandle, "Controls", buf, ud.config.MouseAnalogueScale[i], FALSE, FALSE); - } + Bsprintf(buf, "MouseAnalogScale%d", i); + SCRIPT_PutNumber(ud.config.scripthandle, "Controls", buf, ud.config.MouseAnalogueScale[i], FALSE, FALSE); } } @@ -879,23 +876,14 @@ void CONFIG_WriteSetup(uint32_t flags) SCRIPT_PutString(ud.config.scripthandle, "Controls", buf, CONFIG_FunctionNumToName(ud.config.JoystickDigitalFunctions[dummy][1])); } - if (ud.config.JoystickAnalogueScale[dummy] != DEFAULTJOYSTICKANALOGUESCALE) - { - Bsprintf(buf, "JoystickAnalogScale%d", dummy); - SCRIPT_PutNumber(ud.config.scripthandle, "Controls", buf, ud.config.JoystickAnalogueScale[dummy], FALSE, FALSE); - } + Bsprintf(buf, "JoystickAnalogScale%d", dummy); + SCRIPT_PutNumber(ud.config.scripthandle, "Controls", buf, ud.config.JoystickAnalogueScale[dummy], FALSE, FALSE); - if (ud.config.JoystickAnalogueDead[dummy] != DEFAULTJOYSTICKANALOGUEDEAD) - { - Bsprintf(buf, "JoystickAnalogDead%d", dummy); - SCRIPT_PutNumber(ud.config.scripthandle, "Controls", buf, ud.config.JoystickAnalogueDead[dummy], FALSE, FALSE); - } + Bsprintf(buf, "JoystickAnalogDead%d", dummy); + SCRIPT_PutNumber(ud.config.scripthandle, "Controls", buf, ud.config.JoystickAnalogueDead[dummy], FALSE, FALSE); - if (ud.config.JoystickAnalogueSaturate[dummy] != DEFAULTJOYSTICKANALOGUESATURATE) - { - Bsprintf(buf, "JoystickAnalogSaturate%d", dummy); - SCRIPT_PutNumber(ud.config.scripthandle, "Controls", buf, ud.config.JoystickAnalogueSaturate[dummy], FALSE, FALSE); - } + Bsprintf(buf, "JoystickAnalogSaturate%d", dummy); + SCRIPT_PutNumber(ud.config.scripthandle, "Controls", buf, ud.config.JoystickAnalogueSaturate[dummy], FALSE, FALSE); } }