aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--builtin/settingtypes.txt2
-rw-r--r--src/defaultsettings.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index c751f34f2..3f256ec43 100644
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -105,7 +105,7 @@ random_input (Random input) bool false
continuous_forward (Continuous forward) bool false
# Enable Joysticks
-enable_joysticks (Enable Joysticks) bool true
+enable_joysticks (Enable Joysticks) bool false
# The time in seconds it takes between repeated events
# when holding down a joystick button combination.
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 43a7a7c00..8ee26ecff 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -116,7 +116,7 @@ void set_default_settings(Settings *settings)
settings->setDefault("free_move", "false");
settings->setDefault("noclip", "false");
settings->setDefault("continuous_forward", "false");
- settings->setDefault("enable_joysticks", "true");
+ settings->setDefault("enable_joysticks", "false");
settings->setDefault("repeat_joystick_button_time", "0.17");
settings->setDefault("joystick_frustum_sensitivity", "170");
settings->setDefault("cinematic", "false");