From a4d7bdc0bbd269d64fc885769908b79ff1b85041 Mon Sep 17 00:00:00 2001 From: ewewukek Date: Thu, 4 Apr 2024 14:30:14 +0300 Subject: Enable joystick by default, update default tolerance --- src/defaults.cpp | 6 +----- src/input/joystick.cpp | 3 --- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/defaults.cpp b/src/defaults.cpp index 2c990c42f..3c663309f 100644 --- a/src/defaults.cpp +++ b/src/defaults.cpp @@ -189,12 +189,8 @@ void setConfigDefaults(Configuration &cfg) AddDEF("screenshotDirectory3", ""); AddDEF("useScreenshotDirectorySuffix", true); AddDEF("screenshotDirectorySuffix", ""); -#ifdef __SWITCH__ AddDEF("joystickEnabled", true); -#else - AddDEF("joystickEnabled", false); -#endif - AddDEF("joystickTolerance", 0.1F); + AddDEF("joystickTolerance", 0.3F); AddDEF("useHatForMovement", true); AddDEF("logNpcInGui", true); AddDEF("download-music", true); diff --git a/src/input/joystick.cpp b/src/input/joystick.cpp index 1072d3892..ea1883ad0 100644 --- a/src/input/joystick.cpp +++ b/src/input/joystick.cpp @@ -207,9 +207,6 @@ bool Joystick::open() if (mButtonsNumber > MAX_BUTTONS) mButtonsNumber = MAX_BUTTONS; -#ifdef __SWITCH__ - config.setValue("joystickTolerance", 0.1F); -#endif mTolerance = config.getFloatValue("joystickTolerance"); mUseHatForMovement = config.getBoolValue("useHatForMovement"); mUseInactive = config.getBoolValue("useInactiveJoystick"); -- cgit v1.2.3-60-g2f50