summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorewewukek <ewewukek@gmail.com>2024-04-04 14:30:14 +0300
committerFedja Beader <fedja@protonmail.ch>2024-05-15 00:11:38 +0200
commita4d7bdc0bbd269d64fc885769908b79ff1b85041 (patch)
tree4c36a77fab3adc783f668747c17bc7fad2c0b157
parent16fafb1516a346ee0553a329b0606c2bb55283d7 (diff)
downloadmanaverse-a4d7bdc0bbd269d64fc885769908b79ff1b85041.tar.gz
manaverse-a4d7bdc0bbd269d64fc885769908b79ff1b85041.tar.bz2
manaverse-a4d7bdc0bbd269d64fc885769908b79ff1b85041.tar.xz
manaverse-a4d7bdc0bbd269d64fc885769908b79ff1b85041.zip
Enable joystick by default, update default tolerance
-rw-r--r--src/defaults.cpp6
-rw-r--r--src/input/joystick.cpp3
2 files changed, 1 insertions, 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");