summaryrefslogtreecommitdiff
path: root/src/defaults.cpp
diff options
context:
space:
mode:
authorasuratva <asuratva@proton.me>2024-05-18 10:58:37 +0000
committerasuratva <asuratva@proton.me>2024-05-18 10:58:37 +0000
commit1d7ee3161693ed016264a4940778a6e4b2258e38 (patch)
tree059f68cc39a725a0bc64538e5771ef3525aa6ec6 /src/defaults.cpp
parent9294f5a1ba84c7a4e947ab94a2645625e8a6171d (diff)
parent5570d9d1c2b1b5fba50283ec443088430332bb86 (diff)
downloadplus-1d7ee3161693ed016264a4940778a6e4b2258e38.tar.gz
plus-1d7ee3161693ed016264a4940778a6e4b2258e38.tar.bz2
plus-1d7ee3161693ed016264a4940778a6e4b2258e38.tar.xz
plus-1d7ee3161693ed016264a4940778a6e4b2258e38.zip
Merge branch plus:master into masterHEADmaster
Diffstat (limited to 'src/defaults.cpp')
-rw-r--r--src/defaults.cpp10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/defaults.cpp b/src/defaults.cpp
index 4869de8ef..3c663309f 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -189,15 +189,9 @@ void setConfigDefaults(Configuration &cfg)
AddDEF("screenshotDirectory3", "");
AddDEF("useScreenshotDirectorySuffix", true);
AddDEF("screenshotDirectorySuffix", "");
-#ifdef __SWITCH__
AddDEF("joystickEnabled", true);
-#else
- AddDEF("joystickEnabled", false);
-#endif
- AddDEF("upTolerance", 100);
- AddDEF("downTolerance", 100);
- AddDEF("leftTolerance", 100);
- AddDEF("rightTolerance", 100);
+ AddDEF("joystickTolerance", 0.3F);
+ AddDEF("useHatForMovement", true);
AddDEF("logNpcInGui", true);
AddDEF("download-music", true);
AddDEF("guialpha", 0.8F);